From d69cc7e77e2a35db73c77cf7005749f80fa5b95a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Thu, 11 Jul 2024 17:42:13 +0000
Subject: [PATCH] Revert test updates.

---
 ...eAndAmbientWithSameNameAndCommonRoot.types |   8 +-
 ...mbientClassWithSameNameAndCommonRoot.types |   8 +-
 ...aticFunctionUsingClassPrivateStatics.types |   4 +-
 ...ionAndExportedFunctionThatShareAName.types |  16 +-
 ...AndNonExportedFunctionThatShareAName.types |  16 +-
 ...VariableAndExportedVarThatShareAName.types |  16 +-
 ...iableAndNonExportedVarThatShareAName.types |  16 +-
 ...ssAndModuleWithSameNameAndCommonRoot.types |  16 +-
 ...ndModuleWithSameNameAndCommonRootES6.types |  16 +-
 tests/baselines/reference/ES5For-of30.types   |  24 +-
 tests/baselines/reference/ES5For-of31.types   |  16 +-
 tests/baselines/reference/ES5For-of37.types   |   4 +-
 .../reference/ES5For-ofTypeCheck13.types      |   8 +-
 .../reference/ES5For-ofTypeCheck3.types       |   8 +-
 tests/baselines/reference/ES5for-of32.types   |  12 +-
 ...umAndModuleWithSameNameAndCommonRoot.types |   8 +-
 ...assHeritageListMemberTypeAnnotations.types |  20 +-
 ...essibleTypeInTypeParameterConstraint.types |  20 +-
 ...esInParameterAndReturnTypeAnnotation.types |   8 +-
 ...ssibleTypesInParameterTypeAnnotation.types |   8 +-
 ...ccessibleTypesInReturnTypeAnnotation.types |   8 +-
 ...assHeritageListMemberTypeAnnotations.types |  20 +-
 ...essibleTypeInTypeParameterConstraint.types |  20 +-
 ...hAccessibleTypesOnItsExportedMembers.types |  16 +-
 ...cessibleTypesInMemberTypeAnnotations.types |  24 +-
 ...leWithAccessibleTypeInTypeAnnotation.types |   8 +-
 ...WithInaccessibleTypeInTypeAnnotation.types |  20 +-
 ...uleAndClassWithSameNameAndCommonRoot.types |   8 +-
 ...duleAndEnumWithSameNameAndCommonRoot.types |   8 +-
 ...ithExportedAndNonExportedImportAlias.types |  16 +-
 ...NonInitializedExportInInternalModule.types |   8 +-
 ...AndNonExportedLocalVarsOfTheSameName.types |  20 +-
 ...chWithExportedLocalVarsOfTheSameName.types |   8 +-
 ...ithTheSameNameAndDifferentCommonRoot.types |   8 +-
 ...ulesWithTheSameNameAndSameCommonRoot.types |  16 +-
 .../reference/VariableDeclaration10_es6.types |   4 +-
 .../reference/VariableDeclaration5_es6.types  |   4 +-
 .../abstractPropertyInConstructor.types       |  20 +-
 .../reference/abstractPropertyNegative.types  |   4 +-
 .../reference/acceptSymbolAsWeakType.types    |   4 +-
 .../accessorAccidentalCallDiagnostic.types    |   4 +-
 .../accessorsAreNotContextuallyTyped.types    |   8 +-
 ...cessors_spec_section-4.5_error-cases.types |  32 +-
 ...ddMoreCallSignaturesToBaseSignature2.types |   4 +-
 .../aliasOnMergedModuleInterface.types        |   4 +-
 .../allowImportClausesToMergeWithTypes.types  |   8 +-
 .../allowsImportingTsExtension.types          |   8 +-
 ...ientRequireFunction(module=commonjs).types |   8 +-
 ...ientRequireFunction(module=preserve).types |   8 +-
 .../ambiguousCallsWhereReturnTypesAgree.types |   4 +-
 .../reference/ambiguousOverload.types         |  16 +-
 .../amdLikeInputDeclarationEmit.types         |   8 +-
 .../baselines/reference/amdModuleName1.types  |   8 +-
 .../baselines/reference/amdModuleName2.types  |   8 +-
 tests/baselines/reference/anonterface.types   |   4 +-
 tests/baselines/reference/argsInScope.types   |  12 +-
 .../argumentExpressionContextualTyping.types  |  40 +-
 .../argumentsObjectCreatesRestForJs.types     |   4 +-
 ...mentsSpreadRestIterables(target=es5).types |   8 +-
 ...tsSpreadRestIterables(target=esnext).types |   8 +-
 .../reference/arrayAssignmentTest3.types      |   4 +-
 tests/baselines/reference/arrayAugment.types  |   4 +-
 .../reference/arrayBestCommonTypes.types      |  24 +-
 .../reference/arrayConstructors1.types        |  40 +-
 tests/baselines/reference/arrayEvery.types    |   8 +-
 tests/baselines/reference/arrayFrom.types     |   4 +-
 .../baselines/reference/arrayFromAsync.types  |  64 +-
 tests/baselines/reference/arrayLiteral.types  |  20 +-
 ...rayLiteralExpressionContextualTyping.types |  48 +-
 .../arrayLiteralInNonVarArgParameter.types    |   8 +-
 .../reference/arrayLiteralTypeInference.types |  16 +-
 tests/baselines/reference/arrayLiterals.types |  16 +-
 .../reference/arrayLiterals2ES5.types         |  40 +-
 .../reference/arrayLiterals2ES6.types         |  40 +-
 .../baselines/reference/arrayLiterals3.types  |  32 +-
 .../reference/arrayOfFunctionTypes3.types     |   8 +-
 .../reference/arraySigChecking.types          |   8 +-
 tests/baselines/reference/arraySlice.types    |   8 +-
 .../reference/arraySpreadInCall.types         |  64 +-
 .../reference/arrayToLocaleStringES2015.types |  92 +-
 .../reference/arrayToLocaleStringES2020.types | 112 +--
 .../reference/arrayToLocaleStringES5.types    |  36 +-
 tests/baselines/reference/arrayconcat.types   |  12 +-
 .../reference/arrowFunctionContexts.types     |   8 +-
 .../reference/arrowFunctionExpressions.types  |  40 +-
 .../arrowFunctionWithObjectLiteralBody5.types |  24 +-
 .../arrowFunctionWithObjectLiteralBody6.types |  24 +-
 tests/baselines/reference/asOperator1.types   |  12 +-
 tests/baselines/reference/asOperator2.types   |   4 +-
 tests/baselines/reference/asOperator3.types   |   4 +-
 .../assertionFunctionWildcardImport2.types    |   4 +-
 .../reference/assertionTypePredicates2.types  |   4 +-
 tests/baselines/reference/assign1.types       |   8 +-
 .../reference/assignmentCompatBug2.types      |  60 +-
 .../reference/assignmentCompatBug5.types      |   8 +-
 ...nmentCompatFunctionsWithOptionalArgs.types |  20 +-
 ...CallSignaturesWithOptionalParameters.types |  64 +-
 ...WithCallSignaturesWithRestParameters.types | 112 +--
 ...signmentCompatWithDiscriminatedUnion.types |  12 +-
 .../assignmentCompatWithObjectMembers3.types  |   8 +-
 .../reference/assignmentCompatability1.types  |   4 +-
 .../reference/assignmentCompatability10.types |   8 +-
 .../reference/assignmentCompatability11.types |   4 +-
 .../reference/assignmentCompatability12.types |   4 +-
 .../reference/assignmentCompatability13.types |   4 +-
 .../reference/assignmentCompatability14.types |   4 +-
 .../reference/assignmentCompatability15.types |   4 +-
 .../reference/assignmentCompatability16.types |   4 +-
 .../reference/assignmentCompatability17.types |   4 +-
 .../reference/assignmentCompatability18.types |   4 +-
 .../reference/assignmentCompatability19.types |   4 +-
 .../reference/assignmentCompatability2.types  |   4 +-
 .../reference/assignmentCompatability20.types |   4 +-
 .../reference/assignmentCompatability21.types |   4 +-
 .../reference/assignmentCompatability22.types |   4 +-
 .../reference/assignmentCompatability23.types |   4 +-
 .../reference/assignmentCompatability24.types |   4 +-
 .../reference/assignmentCompatability25.types |   4 +-
 .../reference/assignmentCompatability26.types |   4 +-
 .../reference/assignmentCompatability27.types |   4 +-
 .../reference/assignmentCompatability28.types |   4 +-
 .../reference/assignmentCompatability29.types |   4 +-
 .../reference/assignmentCompatability3.types  |   4 +-
 .../reference/assignmentCompatability30.types |   4 +-
 .../reference/assignmentCompatability31.types |   4 +-
 .../reference/assignmentCompatability32.types |   4 +-
 .../reference/assignmentCompatability33.types |   4 +-
 .../reference/assignmentCompatability34.types |   4 +-
 .../reference/assignmentCompatability35.types |   4 +-
 .../reference/assignmentCompatability36.types |   4 +-
 .../reference/assignmentCompatability37.types |   4 +-
 .../reference/assignmentCompatability38.types |   4 +-
 .../reference/assignmentCompatability39.types |  12 +-
 .../reference/assignmentCompatability4.types  |   4 +-
 .../reference/assignmentCompatability40.types |   8 +-
 .../reference/assignmentCompatability41.types |  12 +-
 .../reference/assignmentCompatability42.types |  12 +-
 .../reference/assignmentCompatability43.types |  12 +-
 .../reference/assignmentCompatability46.types |  20 +-
 .../reference/assignmentCompatability5.types  |   8 +-
 .../reference/assignmentCompatability6.types  |   4 +-
 .../reference/assignmentCompatability7.types  |   8 +-
 .../reference/assignmentCompatability8.types  |   8 +-
 .../reference/assignmentCompatability9.types  |   4 +-
 ...assignmentGenericLookupTypeNarrowing.types |   4 +-
 .../assignmentIndexedToPrimitives.types       |  36 +-
 .../assignmentStricterConstraints.types       |   8 +-
 .../assignmentToObjectAndFunction.types       |   4 +-
 ...assignmentToParenthesizedIdentifiers.types | 216 ++---
 .../reference/assignmentTypeNarrowing.types   |   4 +-
 .../asyncArrowFunction_allowJs.types          |   4 +-
 ...ncFunctionReturnExpressionErrorSpans.types |   4 +-
 .../reference/asyncFunctionReturnType.types   |   4 +-
 ...unctionWithForStatementNoInitializer.types |   8 +-
 .../reference/asyncMethodWithSuper_es6.types  |  16 +-
 .../reference/augmentExportEquals3.types      |   8 +-
 .../reference/augmentExportEquals3_1.types    |   8 +-
 .../reference/augmentExportEquals4.types      |   8 +-
 .../reference/augmentExportEquals4_1.types    |   8 +-
 .../reference/augmentExportEquals6.types      |   8 +-
 .../autoAccessor2(target=es2015).types        |  16 +-
 .../autoAccessor2(target=es2022).types        |  16 +-
 .../autoAccessor2(target=esnext).types        |  16 +-
 tests/baselines/reference/autolift4.types     |   8 +-
 ...BindingElementWithLiteralInitializer.types |   4 +-
 .../awaitCallExpressionInSyncFunction.types   |   4 +-
 tests/baselines/reference/awaitedType.types   |  24 +-
 ...erenceLowerPriorityThanGoodInference.types |   4 +-
 tests/baselines/reference/baseCheck.types     |  16 +-
 .../baseClassImprovedMismatchErrors.types     |   8 +-
 .../reference/bestCommonTypeOfTuple.types     |  16 +-
 .../betterErrorForAccidentalCall.types        |  16 +-
 .../reference/bigint64ArraySubarray.types     |  16 +-
 tests/baselines/reference/bigintIndex.types   |  36 +-
 tests/baselines/reference/bigintWithLib.types | 192 ++---
 .../reference/bigintWithoutLib.errors.txt     |   5 +-
 .../reference/bigintWithoutLib.types          |  32 +-
 ...rnContextualTypeDoesNotCauseWidening.types |  16 +-
 .../binopAssignmentShouldHaveType.types       |   2 +-
 .../bitwiseCompoundAssignmentOperators.types  |  32 +-
 .../bitwiseNotOperatorWithNumberType.types    |  12 +-
 .../bitwiseNotOperatorWithStringType.types    |  16 +-
 ...blockScopedBindingsReassignedInLoop2.types |  32 +-
 ...blockScopedBindingsReassignedInLoop3.types |  32 +-
 ...blockScopedBindingsReassignedInLoop4.types |   8 +-
 ...blockScopedBindingsReassignedInLoop5.types |   8 +-
 ...blockScopedBindingsReassignedInLoop6.types |  16 +-
 ...ScopedSameNameFunctionDeclarationES5.types |   4 +-
 ...ScopedSameNameFunctionDeclarationES6.types |   4 +-
 ...SameNameFunctionDeclarationStrictES5.types |   8 +-
 ...SameNameFunctionDeclarationStrictES6.types |   8 +-
 .../blockScopedVariablesUseBeforeDef.types    |   8 +-
 .../reference/booleanLiteralTypes1.types      |   4 +-
 .../reference/booleanLiteralTypes2.types      |   4 +-
 ...anLiteralsContextuallyTypedFromUnion.types |  16 +-
 ...lerSyntaxRestrictions(module=esnext).types |   4 +-
 ...rSyntaxRestrictions(module=preserve).types |   4 +-
 tests/baselines/reference/callChain.3.types   |  16 +-
 ...onWithIncorrectNumberOfTypeArguments.types | 112 +--
 ...GenericFunctionWithZeroTypeArguments.types |   8 +-
 ...lNonGenericFunctionWithTypeArguments.types |  28 +-
 ...fConditionalTypeWithConcreteBranches.types |  12 +-
 .../baselines/reference/callOnInstance.types  |   8 +-
 ...llOverloadViaElementAccessExpression.types |   8 +-
 .../baselines/reference/callOverloads3.types  |   4 +-
 .../baselines/reference/callOverloads4.types  |   8 +-
 .../baselines/reference/callOverloads5.types  |   8 +-
 ...eWithOptionalParameterAndInitializer.types |  92 +-
 ...WithoutReturnTypeAnnotationInference.types |  12 +-
 ...ShouldBeResolvedBeforeSpecialization.types |   4 +-
 ...ignaturesThatDifferOnlyByReturnType2.types |   8 +-
 ...callSignaturesWithOptionalParameters.types |  68 +-
 ...allSignaturesWithOptionalParameters2.types | 104 +--
 ...lSignaturesWithParameterInitializers.types |  68 +-
 ...SignaturesWithParameterInitializers2.types |  12 +-
 .../reference/callWithMissingVoid.types       |  84 +-
 .../baselines/reference/callWithSpread.types  | 272 +++---
 .../baselines/reference/callWithSpread2.types |  32 +-
 .../baselines/reference/callWithSpread3.types |  32 +-
 .../reference/callWithSpreadES6.types         | 160 ++--
 tests/baselines/reference/callbackTag2.types  |   4 +-
 tests/baselines/reference/callbackTag3.types  |   4 +-
 .../reference/callbackTagNamespace.types      |   4 +-
 .../callbackTagNestedParameter.types          |   4 +-
 .../reference/callbackTagVariadicType.types   |  12 +-
 .../reference/callsOnComplexSignatures.types  | 168 ++--
 .../cannotIndexGenericWritingError.types      |   8 +-
 ...tureSuperPropertyAccessInSuperCall01.types |   4 +-
 .../reference/capturedLetConstInLoop13.types  |  12 +-
 tests/baselines/reference/castTest.types      |  12 +-
 tests/baselines/reference/castingTuple.types  |  24 +-
 tests/baselines/reference/cf.types            |  40 +-
 ...eterConstrainedToOtherTypeParameter2.types |  24 +-
 .../chainedPrototypeAssignment.types          |  10 +-
 .../checkExportsObjectAssignProperty.types    |  96 +--
 ...ExportsObjectAssignPrototypeProperty.types |  50 +-
 tests/baselines/reference/checkJsFiles.types  |   8 +-
 tests/baselines/reference/checkJsFiles2.types |   8 +-
 tests/baselines/reference/checkJsFiles3.types |   8 +-
 tests/baselines/reference/checkJsFiles4.types |   8 +-
 tests/baselines/reference/checkJsFiles5.types |   8 +-
 .../reference/checkJsdocParamTag1.types       |  12 +-
 .../reference/checkJsdocReturnTag1.types      |  20 +-
 .../reference/checkJsdocReturnTag2.errors.txt |   4 +-
 .../reference/checkJsdocReturnTag2.types      |  12 +-
 .../reference/checkJsdocSatisfiesTag1.types   |  24 +-
 .../reference/checkJsdocSatisfiesTag10.types  |  12 +-
 .../reference/checkJsdocSatisfiesTag11.types  |  16 +-
 .../reference/checkJsdocSatisfiesTag12.types  |  32 +-
 .../reference/checkJsdocSatisfiesTag14.types  |   8 +-
 .../reference/checkJsdocSatisfiesTag4.types   |   4 +-
 .../reference/checkJsdocSatisfiesTag6.types   |   4 +-
 .../reference/checkJsdocSatisfiesTag7.types   |  12 +-
 .../reference/checkJsdocSatisfiesTag9.types   |  32 +-
 .../reference/checkJsdocTypeTag1.types        |  16 +-
 .../reference/checkJsdocTypeTag2.types        |  20 +-
 ...checkJsdocTypeTagOnExportAssignment5.types |   8 +-
 ...checkJsdocTypeTagOnExportAssignment6.types |   8 +-
 ...checkJsdocTypeTagOnExportAssignment8.types |   4 +-
 .../checkJsdocTypeTagOnObjectProperty1.types  |  16 +-
 .../checkJsdocTypeTagOnObjectProperty2.types  |  24 +-
 .../checkJsdocTypedefInParamTag1.types        |  12 +-
 .../reference/checkJsxChildrenProperty1.types |  12 +-
 .../checkJsxChildrenProperty14.types          |  20 +-
 .../reference/checkJsxChildrenProperty2.types |  28 +-
 .../reference/checkJsxChildrenProperty5.types |  12 +-
 .../reference/checkJsxChildrenProperty6.types |  16 +-
 .../reference/checkJsxChildrenProperty7.types |  12 +-
 .../reference/checkJsxChildrenProperty8.types |  16 +-
 ...eckJsxGenericTagHasCorrectInferences.types |  16 +-
 ...checkJsxIntersectionElementPropsType.types |   4 +-
 ...onSFXContextualTypeInferredCorrectly.types |   8 +-
 .../reference/checkObjectDefineProperty.types |  32 +-
 .../checkOtherObjectAssignProperty.types      |  12 +-
 .../checkSuperCallBeforeThisAccess.types      |  16 +-
 .../checkSuperCallBeforeThisAccessing1.types  |   8 +-
 .../checkSuperCallBeforeThisAccessing2.types  |  16 +-
 .../checkSuperCallBeforeThisAccessing3.types  |   8 +-
 .../checkSuperCallBeforeThisAccessing4.types  |   8 +-
 .../circularContextualMappedType.types        |  12 +-
 .../circularContextualReturnType.types        |   4 +-
 .../circularInstantiationExpression.types     |   4 +-
 .../circularMappedTypeConstraint.types        |   4 +-
 .../circularOptionalityRemoval.types          |   8 +-
 .../reference/circularReference.types         |  24 +-
 .../circularReferenceInReturnType2.types      |   4 +-
 .../reference/circularResolvedSignature.types |   4 +-
 .../classCanExtendConstructorFunction.types   |  10 +-
 .../classConstructorAccessibility.types       |   8 +-
 .../classConstructorAccessibility2.types      |  60 +-
 .../reference/classExtendingClass.types       |   8 +-
 .../classExtendingClassLikeType.types         |  76 +-
 .../reference/classFunctionMerging.types      |   8 +-
 .../reference/classFunctionMerging2.types     |   4 +-
 .../reference/classImplementsClass2.types     |   4 +-
 .../reference/classImplementsClass3.types     |   4 +-
 .../reference/classImplementsClass4.types     |   4 +-
 .../reference/classImplementsClass5.types     |   4 +-
 .../reference/classImplementsClass6.types     |   8 +-
 .../classMemberInitializerScoping.types       |   8 +-
 .../classPropertyErrorOnNameOnly.errors.txt   |  10 +-
 .../classPropertyErrorOnNameOnly.types        |  48 +-
 ...lParameterWithinItsOwnBaseExpression.types |   4 +-
 .../reference/classSideInheritance1.types     |   8 +-
 .../reference/classStaticBlock17.types        |   4 +-
 .../classStaticBlock24(module=amd).types      |   8 +-
 .../classStaticBlock24(module=commonjs).types |   8 +-
 .../classStaticBlock24(module=es2015).types   |   8 +-
 .../classStaticBlock24(module=es2020).types   |   8 +-
 .../classStaticBlock24(module=es2022).types   |   8 +-
 .../classStaticBlock24(module=esnext).types   |   8 +-
 .../classStaticBlock24(module=system).types   |   8 +-
 .../classStaticBlock24(module=umd).types      |   8 +-
 .../reference/classStaticBlock28.types        |   8 +-
 .../reference/classStaticPropertyAccess.types |  12 +-
 .../classStaticPropertyTypeGuard.types        |   8 +-
 .../reference/classUpdateTests.types          |   8 +-
 .../classUsedBeforeInitializedVariables.types |  12 +-
 .../classWithBaseClassButNoConstructor.types  |  16 +-
 .../reference/classWithConstructors.types     |  44 +-
 .../classWithDuplicateIdentifier.types        |   8 +-
 .../reference/classWithPrivateProperty.types  |   4 +-
 .../classWithProtectedProperty.types          |   4 +-
 .../reference/classWithPublicProperty.types   |   4 +-
 tests/baselines/reference/classdecl.types     |   4 +-
 tests/baselines/reference/cloduleTest1.types  |   6 +-
 .../coAndContraVariantInferences.types        |   4 +-
 .../coAndContraVariantInferences3.types       |   4 +-
 .../coAndContraVariantInferences7.types       |   4 +-
 ...sionSuperAndLocalFunctionInAccessors.types |  12 +-
 ...collisionSuperAndLocalVarInAccessors.types |  12 +-
 ...nThisExpressionAndAmbientVarInGlobal.types |   8 +-
 ...ThisExpressionAndLocalVarInAccessors.types |   8 +-
 .../commaOperatorLeftSideUnused.types         |  24 +-
 .../commaOperatorOtherInvalidOperation.types  |   8 +-
 .../commaOperatorOtherValidOperation.types    |   8 +-
 ...ommaOperatorWithSecondOperandAnyType.types |   8 +-
 ...aOperatorWithSecondOperandNumberType.types |  56 +-
 .../commaOperatorsMultipleOperators.types     |   8 +-
 .../commentBeforeStaticMethod1.types          |   4 +-
 ...enthesizedAssertionInReturnStatement.types |   4 +-
 ...nthesizedAssertionInReturnStatement2.types |   4 +-
 .../reference/commentOnAmbientVariable2.types |   8 +-
 .../reference/commentOnClassAccessor1.types   |   4 +-
 .../reference/commentOnClassAccessor2.types   |   4 +-
 .../commentOnDecoratedClassDeclaration.types  |   8 +-
 .../reference/commentsClassMembers.types      |  16 +-
 .../reference/commentsCommentParsing.types    |   8 +-
 .../reference/commentsFunction.types          |  24 +-
 .../reference/commentsInheritance.types       |  12 +-
 .../reference/commentsInterface.types         |  40 +-
 .../reference/commentsOnObjectLiteral4.types  |   4 +-
 .../reference/commentsOnStaticMembers.types   |   8 +-
 .../reference/commentsOverloads.types         |  72 +-
 .../reference/commentsdoNotEmitComments.types |   4 +-
 .../reference/commentsemitComments.types      |   4 +-
 ...comparisonOperatorWithNumericLiteral.types |  32 +-
 ...essKeyofReliesOnKeyofNeverUpperBound.types |  16 +-
 ...ndexesOfIntersectionsAreInferencable.types |   4 +-
 .../reference/computedEnumTypeWidening.types  |  16 +-
 .../computedPropertiesInDestructuring1.types  |   4 +-
 ...mputedPropertiesInDestructuring1_ES6.types |   4 +-
 .../reference/computedPropertyName.types      |   4 +-
 .../computedPropertyNames48_ES5.types         |  12 +-
 .../computedPropertyNames48_ES6.types         |  12 +-
 .../computedPropertyNames9_ES5.types          |   8 +-
 .../computedPropertyNames9_ES6.types          |   8 +-
 ...utedPropertyNamesContextualType6_ES5.types |   4 +-
 ...utedPropertyNamesContextualType6_ES6.types |   4 +-
 ...utedPropertyNamesContextualType7_ES5.types |   8 +-
 ...utedPropertyNamesContextualType7_ES6.types |   8 +-
 tests/baselines/reference/concatError.types   |   4 +-
 tests/baselines/reference/concatTuples.types  |  24 +-
 ...oesntLeakUninstantiatedTypeParameter.types |   8 +-
 ...itionalTypeAssignabilityWhenDeferred.types |   4 +-
 .../conditionalTypeDoesntSpinForever.types    |   8 +-
 ...lTypeRelaxingConstraintAssignability.types |  12 +-
 .../reference/conditionalTypes1.types         |  12 +-
 .../reference/conditionalTypes2.types         |   4 +-
 .../conditionalTypesExcessProperties.types    |   8 +-
 ...DeclarationShadowedByVarDeclaration3.types |   4 +-
 .../constDeclarations-ambient-errors.types    |  12 +-
 .../reference/constDeclarations-es5.types     |   8 +-
 .../reference/constDeclarations.types         |   8 +-
 .../reference/constDeclarations2.types        |   8 +-
 tests/baselines/reference/constEnums.types    |  12 +-
 ...tSignatureAssignabilityInInheritance.types |   4 +-
 ...ructSignaturesWithIdenticalOverloads.types |  48 +-
 .../constructSignaturesWithOverloads.types    |  48 +-
 .../constructSignaturesWithOverloads2.types   |  32 +-
 .../reference/constructorFunctions2.types     |   4 +-
 .../reference/constructorFunctions3.types     |   8 +-
 .../constructorFunctionsStrict.types          |  12 +-
 ...ctorImplementationWithDefaultValues2.types |   4 +-
 .../reference/constructorOverloads1.types     |   8 +-
 .../reference/constructorOverloads2.types     |   8 +-
 .../reference/constructorOverloads3.types     |   8 +-
 .../reference/constructorOverloads4.types     |   4 +-
 .../reference/constructorOverloads6.types     |   8 +-
 ...nstructorParameterShadowsOuterScopes.types |   8 +-
 ...ructorWithAssignableReturnExpression.types |   4 +-
 ...structorWithIncompleteTypeAnnotation.types |  80 +-
 ...xtualComputedNonBindablePropertyType.types |   4 +-
 ...contextualOverloadListFromArrayUnion.types |  24 +-
 ...ontextualPropertyOfGenericMappedType.types |   4 +-
 .../contextualReturnTypeOfIIFE.types          |  24 +-
 .../contextualReturnTypeOfIIFE2.types         |   4 +-
 .../contextualReturnTypeOfIIFE3.types         |   4 +-
 .../contextualSignatureInstantiation.types    |  48 +-
 ...meterConstrainedToOuterTypeParameter.types |   4 +-
 ...re_objectLiteralMethodMayReturnNever.types |   4 +-
 .../reference/contextualTypeAny.types         |   8 +-
 .../reference/contextualTypeFromJSDoc.types   |  48 +-
 .../contextualTypeIterableUnions.types        |   8 +-
 .../reference/contextualTypeLogicalOr.types   | 192 ++---
 .../contextualTypeShouldBeLiteral.types       |   8 +-
 .../reference/contextualTypeWithTuple.types   |  80 +-
 .../contextualTypeWithUnionTypeMembers.types  |  72 +-
 .../reference/contextualTyping.types          |  40 +-
 .../reference/contextualTyping1.types         |   4 +-
 .../reference/contextualTyping10.types        |   8 +-
 .../reference/contextualTyping12.types        |   8 +-
 .../reference/contextualTyping16.types        |   8 +-
 .../reference/contextualTyping17.types        |   8 +-
 .../reference/contextualTyping18.types        |   4 +-
 .../reference/contextualTyping19.types        |  12 +-
 .../reference/contextualTyping2.types         |   4 +-
 .../reference/contextualTyping20.types        |  12 +-
 .../reference/contextualTyping21.types        |   8 +-
 .../reference/contextualTyping23.types        |   4 +-
 .../reference/contextualTyping24.types        |   4 +-
 .../reference/contextualTyping28.types        |   4 +-
 .../reference/contextualTyping29.types        |   8 +-
 .../reference/contextualTyping3.types         |   4 +-
 .../reference/contextualTyping30.types        |   8 +-
 .../reference/contextualTyping31.types        |   4 +-
 .../reference/contextualTyping34.types        |   4 +-
 .../reference/contextualTyping35.types        |   4 +-
 .../reference/contextualTyping36.types        |   4 +-
 .../reference/contextualTyping39.types        |   4 +-
 .../reference/contextualTyping4.types         |   4 +-
 .../reference/contextualTyping6.types         |   8 +-
 .../reference/contextualTyping9.types         |   8 +-
 ...TypingArrayDestructuringWithDefaults.types |   8 +-
 .../contextualTypingOfOptionalMembers.types   |  16 +-
 ...urnStatementWithReturnTypeAnnotation.types |   4 +-
 ...extualTypingWithFixedTypeParameters1.types |   8 +-
 .../contextuallyTypeArgumentsKeyword.types    |   4 +-
 ...textuallyTypeAsyncFunctionReturnType.types |  12 +-
 ...allyTypeGeneratorReturnTypeFromUnion.types |   8 +-
 .../contextuallyTypedBindingInitializer.types |   8 +-
 ...uallyTypedBindingInitializerNegative.types |   8 +-
 .../contextuallyTypedBooleanLiterals.types    |   8 +-
 ...ontextuallyTypedByDiscriminableUnion.types |   8 +-
 ...edClassExpressionMethodDeclaration01.types |  32 +-
 ...ctionExpressionsAndReturnAnnotations.types |   4 +-
 ...ypedObjectLiteralMethodDeclaration01.types |  48 +-
 ...tuallyTypedParametersOptionalInJSDoc.types |  16 +-
 ...allyTypedParametersWithInitializers1.types |  68 +-
 ...allyTypedParametersWithInitializers2.types |  12 +-
 ...allyTypedParametersWithInitializers4.types |   8 +-
 ...allyTypedParametersWithQuestionToken.types |  16 +-
 ...ntextuallyTypedSymbolNamedProperties.types |   8 +-
 .../contextuallyTypingOrOperator.types        |   4 +-
 .../contextuallyTypingOrOperator2.types       |   4 +-
 .../contravariantInferenceAndTypeGuard.types  |   4 +-
 ...ntOnlyInferenceFromAnnotatedFunction.types |   4 +-
 ...OnlyInferenceFromAnnotatedFunctionJs.types |   4 +-
 .../reference/controlFlowAliasing.types       |  28 +-
 ...les(useunknownincatchvariables=true).types |   8 +-
 .../reference/controlFlowArrayErrors.types    |   8 +-
 .../reference/controlFlowBindingElement.types |  44 +-
 .../reference/controlFlowCaching.types        |  24 +-
 .../reference/controlFlowDeleteOperator.types |  20 +-
 .../controlFlowDestructuringDeclaration.types |  64 +-
 .../controlFlowDestructuringLoop.types        |   4 +-
 .../controlFlowDoWhileStatement.types         |  64 +-
 .../reference/controlFlowElementAccess.types  |   8 +-
 .../reference/controlFlowElementAccess2.types |  16 +-
 ...controlFlowFinallyNoCatchAssignments.types |  16 +-
 .../controlFlowForInStatement2.types          |   4 +-
 .../controlFlowForIndexSignatures.types       |  12 +-
 .../reference/controlFlowGenericTypes.types   |  20 +-
 .../baselines/reference/controlFlowIIFE.types |  40 +-
 .../reference/controlFlowIfStatement.types    |  36 +-
 .../reference/controlFlowInOperator.types     |  28 +-
 ...lowInitializedDestructuringVariables.types |   4 +-
 ...controlFlowInstanceOfGuardPrimitives.types |   4 +-
 .../reference/controlFlowInstanceof.types     |   8 +-
 ...controlFlowInstanceofExtendsFunction.types |   4 +-
 ...lFlowInstanceofWithSymbolHasInstance.types |   8 +-
 .../reference/controlFlowIteration.types      |   8 +-
 .../reference/controlFlowLoopAnalysis.types   |  20 +-
 .../controlFlowNullTypeAndLiteral.types       |   4 +-
 .../controlFlowNullishCoalesce.types          |  16 +-
 .../reference/controlFlowOptionalChain.types  |  36 +-
 .../reference/controlFlowOuterVariable.types  |   4 +-
 .../reference/controlFlowParameter.types      |  40 +-
 .../controlFlowPropertyDeclarations.types     |   8 +-
 .../controlFlowSelfReferentialLoop.types      |   4 +-
 .../reference/controlFlowWhileStatement.types |  64 +-
 .../controlFlowWithTemplateLiterals.types     |   8 +-
 .../reference/copyrightWithNewLine1.types     |   4 +-
 .../reference/copyrightWithoutNewLine1.types  |   4 +-
 .../reference/correlatedUnions.types          |  46 +-
 tests/baselines/reference/createArray.types   |   4 +-
 .../reference/customAsyncIterator.types       |   4 +-
 .../reference/customEventDetail.types         |   4 +-
 .../reference/dataViewConstructor.types       |   4 +-
 .../reference/declFileAccessors.types         |  48 +-
 .../reference/declFileConstructors.types      |   8 +-
 .../reference/declFileFunctions.types         |  12 +-
 .../baselines/reference/declFileMethods.types |  32 +-
 .../declFileObjectLiteralWithAccessors.types  |  12 +-
 .../declFileObjectLiteralWithOnlyGetter.types |   4 +-
 .../declFileObjectLiteralWithOnlySetter.types |  12 +-
 .../declFileTypeAnnotationBuiltInType.types   |   8 +-
 .../declarationEmitClassAccessorsJs1.types    |   4 +-
 ...tClassMemberWithComputedPropertyName.types |   8 +-
 ...nEmitClassMixinLocalClassDeclaration.types |   4 +-
 ...onEmitClassSetAccessorParamNameInJs3.types |   4 +-
 ...tComputedNameCausesImportToBePainted.types |   4 +-
 ...DoesNotUseReexportedNamespaceAsLocal.types |   4 +-
 ...tionEmitExpandoWithGenericConstraint.types |   8 +-
 ...ionEmitExportAliasVisibiilityMarking.types |   4 +-
 .../declarationEmitExpressionInExtends2.types |   4 +-
 ...onEmitInlinedDistributiveConditional.types |  16 +-
 .../declarationEmitLateBoundAssignments.js    |   2 +-
 .../declarationEmitLateBoundAssignments.types |  32 +-
 .../declarationEmitLateBoundAssignments2.js   |  12 +-
 ...declarationEmitLateBoundAssignments2.types | 100 +--
 .../declarationEmitLateBoundJSAssignments.js  |   2 +-
 ...eclarationEmitLateBoundJSAssignments.types |  32 +-
 ...ppedTypePropertyFromNumericStringKey.types |   4 +-
 ...clarationEmitObjectLiteralAccessors1.types |  12 +-
 ...arationEmitObjectLiteralAccessorsJs1.types |  12 +-
 .../declarationEmitPathMappingMonorepo2.types |   8 +-
 ...onEmitPrefersPathKindBasedOnBundling.types |   2 +-
 ...nEmitPrefersPathKindBasedOnBundling2.types |   2 +-
 ...ivateSymbolCausesVarDeclarationEmit2.types |   4 +-
 ...ymbolCausesVarDeclarationToBeEmitted.types |   2 +-
 .../declarationEmitProtectedMembers.types     |   4 +-
 ...larationEmitReadonlyComputedProperty.types |   4 +-
 ...rationEmitReexportedSymlinkReference.types |   4 +-
 ...ationEmitReexportedSymlinkReference2.types |   4 +-
 ...ationEmitReexportedSymlinkReference3.types |   4 +-
 ...onEmitStringEnumUsedInNonlocalSpread.types |   8 +-
 ...itUsingAlternativeContainingModules1.types |   8 +-
 ...itUsingAlternativeContainingModules2.types |   8 +-
 ...FileForHtmlFileWithinDeclarationFile.types |   4 +-
 ...port(allowarbitraryextensions=false).types |   4 +-
 ...mport(allowarbitraryextensions=true).types |   4 +-
 ...dules(allowarbitraryextensions=true).types |   2 +-
 .../reference/declarationMapsMultifile.types  |   8 +-
 .../reference/declarationMapsOutFile.types    |   8 +-
 .../reference/declarationMapsOutFile2.types   |   8 +-
 .../declarationMapsWithSourceMap.types        |   8 +-
 ...rationsForIndirectTypeAliasReference.types |   8 +-
 ...tionsIndirectGeneratedAliasReference.types |   4 +-
 ...InternalTypesProduceUniqueTypeParams.types |  12 +-
 .../reference/decoratorInAmbientContext.types |   4 +-
 .../decoratorMetadataOnInferredType.types     |   4 +-
 ...decoratorMetadataWithConstructorType.types |   4 +-
 .../reference/decoratorOnClassAccessor7.types |  24 +-
 .../reference/decoratorOnClassAccessor8.types |  16 +-
 .../reference/decoratorReferences.types       |   4 +-
 .../decoratorsOnComputedProperties.types      |  12 +-
 .../decrementOperatorWithNumberType.types     |   8 +-
 ...ratorWithNumberTypeInvalidOperations.types |  12 +-
 ...entOperatorWithUnsupportedStringType.types |  12 +-
 ...deepElaborationsIntoArrowExpressions.types |  12 +-
 ...ertyCheckingWhenTargetIsIntersection.types |   8 +-
 .../reference/deeplyNestedCheck.types         |   8 +-
 .../defaultArgsInFunctionExpressions.types    |  20 +-
 .../defaultBestCommonTypesHaveDecls.types     |   8 +-
 ...terAddsUndefinedWithStrictNullChecks.types |  68 +-
 .../defaultValueInFunctionOverload1.types     |   4 +-
 .../defaultValueInFunctionTypes.types         |  12 +-
 .../definiteAssignmentAssertions.types        |  16 +-
 ...ignmentAssertionsWithObjectShortHand.types |   4 +-
 .../deleteOperatorWithNumberType.types        |  12 +-
 .../deleteOperatorWithStringType.types        |  16 +-
 .../baselines/reference/deleteReadonly.types  |   2 +-
 .../dependentDestructuredVariables.types      |  44 +-
 ...tructuredVariablesFromNestedPatterns.types |   4 +-
 ...lassConstructorWithExplicitReturns01.types |  12 +-
 ...derivedClassIncludesInheritedMembers.types |  16 +-
 .../derivedClassParameterProperties.types     |  72 +-
 .../reference/derivedClassTransitivity.types  |   8 +-
 .../reference/derivedClassTransitivity2.types |  16 +-
 .../reference/derivedClassTransitivity3.types |  16 +-
 .../reference/derivedClassTransitivity4.types |   8 +-
 .../reference/derivedClassWithAny.types       |  32 +-
 ...teInstanceShadowingProtectedInstance.types |   8 +-
 ...ivateInstanceShadowingPublicInstance.types |   8 +-
 ...rivateStaticShadowingProtectedStatic.types |   8 +-
 ...thPrivateStaticShadowingPublicStatic.types |  24 +-
 ...rivedClassWithoutExplicitConstructor.types |   4 +-
 ...ivedClassWithoutExplicitConstructor2.types |  24 +-
 ...ivedClassWithoutExplicitConstructor3.types |  20 +-
 .../derivedInterfaceCallSignature.types       |   4 +-
 ...HiddenBaseCallViaSuperPropertyAccess.types |  16 +-
 .../destructureOptionalParameter.types        |   8 +-
 .../destructureTupleWithVariableElement.types |   8 +-
 ...ArrayBindingPatternAndAssignment1ES5.types |  16 +-
 ...dingPatternAndAssignment1ES5iterable.types |  16 +-
 ...ArrayBindingPatternAndAssignment1ES6.types |  16 +-
 ...ingArrayBindingPatternAndAssignment2.types |  24 +-
 ...ingArrayBindingPatternAndAssignment3.types |  12 +-
 ...ternAndAssignment5SiblingInitializer.types |   8 +-
 .../destructuringAssignabilityCheck.types     |   4 +-
 .../destructuringAssignmentWithDefault2.types |  20 +-
 .../reference/destructuringControlFlow.types  |   4 +-
 ...bjectBindingPatternAndAssignment1ES5.types |  12 +-
 ...bjectBindingPatternAndAssignment1ES6.types |  12 +-
 ...ternAndAssignment9SiblingInitializer.types |   8 +-
 ...estructuringParameterDeclaration1ES5.types |  48 +-
 ...ringParameterDeclaration1ES5iterable.types |  48 +-
 ...estructuringParameterDeclaration1ES6.types |  48 +-
 .../destructuringParameterDeclaration2.types  |  36 +-
 ...estructuringParameterDeclaration3ES5.types |  52 +-
 ...ringParameterDeclaration3ES5iterable.types |  52 +-
 ...estructuringParameterDeclaration3ES6.types |  52 +-
 .../destructuringParameterDeclaration4.types  |  24 +-
 .../destructuringParameterProperties1.types   |  36 +-
 .../destructuringParameterProperties2.types   |  24 +-
 .../destructuringParameterProperties3.types   |  24 +-
 .../destructuringParameterProperties5.types   |   4 +-
 .../reference/destructuringSameNames.types    |  96 +--
 .../destructuringTypeGuardFlow.types          |  16 +-
 .../destructuringUnspreadableIntoRest.types   |   4 +-
 ...ionsForExpressionsWhichCouldBeCalled.types |   8 +-
 .../discriminateWithMissingProperty.types     |   4 +-
 .../discriminatedUnionInference.types         |  12 +-
 .../reference/discriminatedUnionTypes2.types  |  10 +-
 .../reference/dissallowSymbolAsWeakType.types |   4 +-
 .../reference/divergentAccessors1.types       |  16 +-
 .../reference/divergentAccessorsTypes1.types  |  32 +-
 .../reference/divergentAccessorsTypes2.types  |  16 +-
 .../reference/divergentAccessorsTypes3.types  |  60 +-
 .../reference/divergentAccessorsTypes4.types  |   8 +-
 .../reference/divergentAccessorsTypes5.types  |  12 +-
 .../reference/divergentAccessorsTypes6.types  |  20 +-
 .../reference/divergentAccessorsTypes8.types  | 124 +--
 .../divergentAccessorsVisibility1.types       | 288 +++----
 ...denAtObjectLiteralPropertyAssignment.types |   4 +-
 ...dToChangeYourTargetLibraryES2016Plus.types |  12 +-
 ...urTargetLibraryES2023(target=esnext).types |  72 +-
 .../reference/dottedModuleName.types          |   4 +-
 .../reference/dottedSymbolResolution1.types   |  12 +-
 .../reference/doubleUnderscoreEnumEmit.types  |   8 +-
 .../doubleUnderscoreMappedTypes.types         |  16 +-
 .../reference/downlevelLetConst10.types       |   4 +-
 .../reference/downlevelLetConst17.types       |   8 +-
 .../reference/downlevelLetConst5.types        |   4 +-
 .../reference/duplicateClassElements.types    |  12 +-
 .../duplicateErrorAssignability.types         |   4 +-
 .../duplicateErrorClassExpression.types       |   4 +-
 .../reference/duplicateLocalVariable1.types   | 212 ++---
 .../reference/duplicateLocalVariable2.types   |   4 +-
 .../duplicateObjectLiteralProperty.types      |   4 +-
 ...iteralProperty_computedNameNegative1.types |  16 +-
 ...namicImportInDefaultExportExpression.types |   4 +-
 .../reference/dynamicImportsDeclaration.types |  16 +-
 .../reference/dynamicNamesErrors.types        |  24 +-
 ...tLiteralExpressionInArrowFunctionES5.types |  16 +-
 ...tLiteralExpressionInArrowFunctionES6.types |  16 +-
 .../reference/emitArrowFunctionES6.types      |   4 +-
 ...itCapturingThisInTupleDestructuring2.types |   8 +-
 ...ClassDeclarationWithConstructorInES6.types |  12 +-
 ...itClassDeclarationWithExtensionInES6.types |   8 +-
 ...lassDeclarationWithGetterSetterInES6.types |   8 +-
 .../emitClassDeclarationWithMethodInES6.types |  12 +-
 ...clarationWithPropertyAssignmentInES6.types |  24 +-
 ...ionWithStaticPropertyAssignmentInES6.types |   4 +-
 ...ClassDeclarationWithThisKeywordInES6.types |   8 +-
 ...assMergedWithConstNamespaceNotElided.types |   4 +-
 ...tDefaultParametersFunctionExpression.types |   4 +-
 ...faultParametersFunctionExpressionES6.types |   4 +-
 .../emitStatementsBeforeSuperCall.types       |   8 +-
 ...mentsBeforeSuperCallWithDefineFields.types |   8 +-
 ...ectNarrowing(strictnullchecks=false).types |   8 +-
 ...jectNarrowing(strictnullchecks=true).types |   8 +-
 .../reference/emptyThenWarning.types          |   8 +-
 .../enumAssignabilityInInheritance.types      |   4 +-
 .../reference/enumClassification.types        |   4 +-
 ...rrorOnConstantBindingWithInitializer.types |   4 +-
 .../reference/enumLiteralTypes1.types         |   4 +-
 .../reference/enumLiteralTypes2.types         |   4 +-
 .../baselines/reference/enumOperations.types  |   4 +-
 tests/baselines/reference/enumTag.types       |  16 +-
 .../baselines/reference/enumTagImported.types |   8 +-
 .../reference/errorCause(target=es2021).types |  72 +-
 .../reference/errorCause(target=es2022).types |  72 +-
 .../reference/errorCause(target=esnext).types |  72 +-
 ...errorForConflictingExportEqualsValue.types |   4 +-
 ...ForwardReferenceForwadingConstructor.types |   4 +-
 .../errorMessagesIntersectionTypes01.types    |   4 +-
 ...rrorOnInitializerInInterfaceProperty.types |   4 +-
 ...itializerInObjectTypeLiteralProperty.types |   8 +-
 .../reference/errorSuperPropertyAccess.types  |  64 +-
 ...errorsOnUnionsOfOverlappingObjects01.types |  20 +-
 .../baselines/reference/es2016IntlAPIs.types  |   8 +-
 .../baselines/reference/es2017DateAPIs.types  |   4 +-
 .../baselines/reference/es2018IntlAPIs.types  |   4 +-
 .../baselines/reference/es2020IntlAPIs.types  |  32 +-
 .../baselines/reference/es2022IntlAPIs.types  |   4 +-
 .../reference/es2022SharedMemory.types        |  20 +-
 .../es5-asyncFunctionLongObjectLiteral.types  |  60 +-
 tests/baselines/reference/es5DateAPIs.types   |   4 +-
 .../reference/es6ClassSuperCodegenBug.types   |  16 +-
 tests/baselines/reference/es6ClassTest.types  |  12 +-
 tests/baselines/reference/es6ClassTest2.types | 120 +--
 tests/baselines/reference/es6ClassTest3.types |  16 +-
 tests/baselines/reference/es6ClassTest8.types |   8 +-
 .../es6ExportClauseWithAssignmentInEs5.types  |  16 +-
 .../reference/es6MemberScoping.types          |   4 +-
 .../reference/es6UseOfTopLevelRequire.types   |   4 +-
 ...Declaration-sourceMap(target=es2015).types |   8 +-
 ...Declaration-sourceMap(target=es2022).types |   8 +-
 ...Declaration-sourceMap(target=esnext).types |   8 +-
 .../esDecorators-contextualTypes.2.types      |   4 +-
 ...mberMustBeSyntacticallyDefaultExport.types |   8 +-
 .../reference/esModuleInteropImportCall.types |   4 +-
 .../reference/escapedIdentifiers.types        | 172 ++--
 tests/baselines/reference/evalAfter0.types    |   4 +-
 ...veryTypeWithAnnotationAndInitializer.types |  28 +-
 ...eWithAnnotationAndInvalidInitializer.types |  20 +-
 .../reference/everyTypeWithInitializer.types  |   8 +-
 ...yCheckIntersectionWithIndexSignature.types |   8 +-
 ...tyCheckIntersectionWithRecursiveType.types |  12 +-
 ...opertyCheckWithMultipleDiscriminants.types |  28 +-
 ...ertyCheckWithNestedArrayIntersection.types |   4 +-
 .../excessPropertyCheckWithUnions.types       |  56 +-
 ...ropertyChecksWithNestedIntersections.types |  60 +-
 .../excessPropertyErrorForFunctionTypes.types |   8 +-
 .../excessPropertyErrorsSuppressed.types      |   4 +-
 .../exhaustiveSwitchCheckCircularity.types    |   8 +-
 .../exhaustiveSwitchImplicitReturn.types      |  28 +-
 .../exhaustiveSwitchStatements1.types         | 148 ++--
 ...ustiveSwitchWithWideningLiteralTypes.types |   8 +-
 ...andoFunctionExpressionsWithDynamicNames.js |   4 +-
 ...oFunctionExpressionsWithDynamicNames.types |  32 +-
 ...andoFunctionNestedAssigmentsDeclared.types | 168 ++--
 .../baselines/reference/expandoOnAlias.types  |   8 +-
 ...portAssignmentConstrainedGenericType.types |   6 +-
 .../exportAssignmentMergedInterface.types     |   6 +-
 .../exportAssignmentMergedModule.types        |   4 +-
 .../exportClassExtendingIntersection.types    |   4 +-
 .../exportDefaultAsyncFunction2.types         |   4 +-
 ...ssWithStaticPropertyAssignmentsInES6.types |   4 +-
 ...DefaultInterfaceAndFunctionOverloads.types |   4 +-
 ...ltInterfaceClassAndFunctionOverloads.types |   4 +-
 .../reference/exportDefaultProperty.types     |   4 +-
 ...xportDefaultTypeAndFunctionOverloads.types |   4 +-
 ...xportEqualsClassNoRedeclarationError.types |   4 +-
 .../exportEqualsClassRedeclarationError.types |   4 +-
 .../exportEqualsDefaultProperty.types         |   4 +-
 .../reference/exportEqualsProperty.types      |   4 +-
 .../reference/exportImportAlias.types         |  20 +-
 .../reference/exportImportAndClodule.types    |   4 +-
 .../exportImportNonInstantiatedModule.types   |   4 +-
 .../exportImportNonInstantiatedModule2.types  |   4 +-
 .../exportNonInitializedVariablesAMD.types    |   8 +-
 ...xportNonInitializedVariablesCommonJS.types |   8 +-
 .../exportNonInitializedVariablesES6.types    |   8 +-
 .../exportNonInitializedVariablesSystem.types |   8 +-
 .../exportNonInitializedVariablesUMD.types    |   8 +-
 .../reference/exportNonVisibleType.types      |   6 +-
 ...tTypeMergedWithExportStarAsNamespace.types |   4 +-
 .../expressionTypeNodeShouldError.types       |  12 +-
 ...ionsForbiddenInParameterInitializers.types |   4 +-
 .../extendConstructSignatureInInterface.types |   4 +-
 .../extendedInterfaceGenericType.types        |   4 +-
 tests/baselines/reference/externFunc.types    |   4 +-
 .../baselines/reference/externSemantics.types |   4 +-
 .../reference/fallFromLastCase1.types         |  16 +-
 .../reference/fallFromLastCase2.types         |  24 +-
 ...backToBindingPatternForTypeInference.types |  12 +-
 tests/baselines/reference/fatArrowSelf.types  |   4 +-
 .../reference/fatarrowfunctions.types         |   4 +-
 .../fatarrowfunctionsInFunctions.types        |   4 +-
 .../fatarrowfunctionsOptionalArgs.types       |  56 +-
 ...fatarrowfunctionsOptionalArgsErrors4.types |  28 +-
 .../fieldAndGetterWithSameName.types          |   4 +-
 .../reference/filterNamespace_import.types    |   8 +-
 .../reference/fixSignatureCaching.types       |  16 +-
 ...rameterInSignatureWithRestParameters.types |   8 +-
 .../fixingTypeParametersRepeatedly1.types     |   4 +-
 .../flatArrayNoExcessiveStackDepth.types      |   4 +-
 tests/baselines/reference/for-of36.types      |   4 +-
 tests/baselines/reference/for-of37.types      |   4 +-
 tests/baselines/reference/for-of38.types      |   4 +-
 tests/baselines/reference/for-of39.types      |   8 +-
 tests/baselines/reference/for-of40.types      |   4 +-
 tests/baselines/reference/for-of44.types      |  12 +-
 tests/baselines/reference/for-of45.types      |  12 +-
 tests/baselines/reference/for-of46.types      |   4 +-
 tests/baselines/reference/for-of49.types      |   4 +-
 tests/baselines/reference/for-of50.types      |   4 +-
 tests/baselines/reference/for.types           |   4 +-
 tests/baselines/reference/forStatements.types |  28 +-
 .../forStatementsMultipleInvalidDecl.types    |   4 +-
 .../forStatementsMultipleValidDecl.types      |  16 +-
 tests/baselines/reference/funcdecl.types      |   8 +-
 .../reference/functionAssignment.types        |  16 +-
 .../reference/functionAssignmentError.types   |   4 +-
 .../baselines/reference/functionCall10.types  |  20 +-
 .../baselines/reference/functionCall11.types  |  28 +-
 .../baselines/reference/functionCall12.types  |  44 +-
 .../baselines/reference/functionCall13.types  |  32 +-
 .../baselines/reference/functionCall14.types  |  32 +-
 .../baselines/reference/functionCall16.types  |  40 +-
 .../baselines/reference/functionCall17.types  |  48 +-
 .../baselines/reference/functionCall18.types  |   4 +-
 tests/baselines/reference/functionCall2.types |   4 +-
 tests/baselines/reference/functionCall6.types |  12 +-
 tests/baselines/reference/functionCall8.types |  12 +-
 tests/baselines/reference/functionCall9.types |  28 +-
 ...unctionCallOnConstrainedTypeVariable.types |  16 +-
 .../functionExpressionContextualTyping1.types |  20 +-
 .../functionExpressionShadowedByParams.types  |   8 +-
 .../reference/functionOnlyHasThrow.types      |   4 +-
 ...ctionOverloadCompatibilityWithVoid02.types |   4 +-
 .../reference/functionOverloads.types         |   4 +-
 .../reference/functionOverloads1.types        |   4 +-
 .../reference/functionOverloads11.types       |   4 +-
 .../reference/functionOverloads17.types       |   4 +-
 .../reference/functionOverloads20.types       |   4 +-
 .../reference/functionOverloads26.types       |   4 +-
 .../reference/functionOverloads27.types       |   4 +-
 .../reference/functionOverloads30.types       |   4 +-
 .../reference/functionOverloads31.types       |   4 +-
 .../reference/functionOverloads35.types       |   4 +-
 .../reference/functionOverloads36.types       |   4 +-
 .../reference/functionOverloads38.types       |   4 +-
 .../reference/functionOverloads4.types        |   4 +-
 .../reference/functionOverloads43.types       |   8 +-
 .../reference/functionOverloads44.types       |  16 +-
 .../reference/functionOverloads45.types       |  16 +-
 .../reference/functionOverloads7.types        |   2 +-
 .../reference/functionOverloads9.types        |   4 +-
 .../functionParameterArityMismatch.types      | 100 +--
 .../baselines/reference/functionReturn.types  |   8 +-
 tests/baselines/reference/functionType.types  |   4 +-
 .../functionWithThrowButNoReturn1.types       |   4 +-
 ...issingReturnStatementsAndExpressions.types |   4 +-
 ...eToUndefined(strictnullchecks=false).types |   4 +-
 ...leToUndefined(strictnullchecks=true).types |   4 +-
 tests/baselines/reference/fuzzy.types         |   8 +-
 .../generatorExplicitReturnType.types         |  12 +-
 .../generatorReturnTypeFallback.5.types       |   4 +-
 .../generatorTransformFinalLabel.types        |   2 +-
 .../reference/generatorTypeCheck13.types      |   4 +-
 .../reference/generatorTypeCheck45.types      |   4 +-
 .../reference/generatorTypeCheck46.types      |   4 +-
 .../reference/generatorTypeCheck62.types      |  12 +-
 .../reference/generatorTypeCheck63.types      |  16 +-
 .../generatorYieldContextualType.types        |  12 +-
 tests/baselines/reference/generic.types       |   8 +-
 .../genericAndNonGenericOverload1.types       |   4 +-
 .../reference/genericArrayMethods1.types      |   4 +-
 ...allInferenceWithGenericLocalFunction.types |   8 +-
 ...allOnMemberReturningClosedOverObject.types |   8 +-
 .../genericCallTypeArgumentInference.types    |  80 +-
 .../genericCallWithArrayLiteralArgs.types     |  24 +-
 ...ithConstraintsTypeArgumentInference2.types |   4 +-
 ...enericCallWithFunctionTypedArguments.types |  96 +--
 ...nericCallWithFunctionTypedArguments2.types |  24 +-
 ...nericCallWithFunctionTypedArguments5.types |  12 +-
 ...ricCallWithGenericSignatureArguments.types |  16 +-
 ...icCallWithGenericSignatureArguments2.types |  16 +-
 ...icCallWithGenericSignatureArguments3.types |  28 +-
 .../genericCallWithObjectLiteralArgs.types    |  16 +-
 ...nericCallWithObjectLiteralArguments1.types |  60 +-
 ...allWithObjectTypeArgsAndConstraints4.types |   8 +-
 ...allWithObjectTypeArgsAndConstraints5.types |   4 +-
 ...hOverloadedConstructorTypedArguments.types |  12 +-
 ...OverloadedConstructorTypedArguments2.types |   8 +-
 ...WithOverloadedFunctionTypedArguments.types |   8 +-
 ...ithOverloadedFunctionTypedArguments2.types |  12 +-
 .../reference/genericCallWithTupleType.types  |  24 +-
 .../genericClassExpressionInFunction.types    |  24 +-
 ...assPropertyInheritanceSpecialization.types |   4 +-
 ...lassWithFunctionTypedMemberArguments.types | 100 +--
 .../genericClassWithStaticFactory.types       |   8 +-
 .../reference/genericConstraint1.types        |   8 +-
 .../reference/genericConstraint2.types        |  18 +-
 .../genericConstraintSatisfaction1.types      |   4 +-
 ...genericConstructSignatureInInterface.types |   4 +-
 .../reference/genericContextualTypes2.types   |   4 +-
 .../reference/genericContextualTypes3.types   |   4 +-
 ...enericContextualTypingSpecialization.types |   4 +-
 .../baselines/reference/genericDefaults.types |  24 +-
 .../reference/genericDefaultsJs.types         |  12 +-
 .../reference/genericFunctionInference1.types |  64 +-
 ...enericFunctionTypedArgumentsAreFixed.types |   4 +-
 .../reference/genericFunctions0.types         |   4 +-
 ...ericFunctionsAndConditionalInference.types |   8 +-
 ...ericFunctionsWithOptionalParameters3.types |   8 +-
 ...ccessVarianceComparisonResultCorrect.types |  12 +-
 .../reference/genericInference2.types         |  12 +-
 .../reference/genericMappedTypeAsClause.types |  10 +-
 .../reference/genericNewInterface.types       |   8 +-
 .../genericObjectLitReturnType.types          |  12 +-
 tests/baselines/reference/genericReduce.types |  16 +-
 .../baselines/reference/genericRestArgs.types |  24 +-
 .../reference/genericRestArity.types          |  28 +-
 .../reference/genericRestArityStrict.types    |  28 +-
 .../reference/genericRestParameters1.types    | 194 ++---
 .../reference/genericRestParameters2.types    | 228 ++---
 .../genericRestParameters3.errors.txt         |  24 +-
 .../reference/genericRestParameters3.types    |  78 +-
 .../genericReversingTypeParameters.types      |   8 +-
 .../genericReversingTypeParameters2.types     |   4 +-
 .../reference/genericSetterInClassType.types  |  12 +-
 .../genericSetterInClassTypeJsDoc.types       |  12 +-
 .../reference/genericSpecializations3.types   |   8 +-
 .../genericStaticAnyTypeFunction.types        |   4 +-
 ...genericTupleWithSimplifiableElements.types |   8 +-
 .../reference/genericTypeAliases.types        |  30 +-
 .../genericWithOpenTypeParameters1.types      |   8 +-
 .../reference/getAndSetNotIdenticalType.types |   4 +-
 .../getSetAccessorContextualTyping.types      |   8 +-
 .../reference/getsetReturnTypes.types         |   8 +-
 .../getterControlFlowStrictNull.types         |  12 +-
 .../getterSetterSubtypeAssignment.types       |   8 +-
 .../reference/gettersAndSetters.types         |  36 +-
 .../gettersAndSettersAccessibility.types      |   4 +-
 .../reference/gettersAndSettersErrors.types   |   8 +-
 .../gettersAndSettersTypesAgree.types         |   8 +-
 tests/baselines/reference/global.types        |   4 +-
 ...rgeWithCommonJSAssignmentDeclaration.types |   8 +-
 .../globalThisReadonlyProperties.types        |   8 +-
 .../heterogeneousArrayAndOverloads.types      |  36 +-
 .../reference/hidingCallSignatures.types      |  16 +-
 .../reference/hidingConstructSignatures.types |  16 +-
 ...nHomomorphicInstantiationSpreadable1.types |  20 +-
 .../reference/ifDoWhileStatements.types       |   4 +-
 .../reference/ignoredJsxAttributes.types      |  16 +-
 .../illegalSuperCallsInConstructor.types      |   4 +-
 .../implicitAnyFromCircularInference.types    |   4 +-
 ...yFunctionInvocationWithAnyArguements.types |   4 +-
 ...icitAnyFunctionReturnNullOrUndefined.types |   4 +-
 .../reference/implicitAnyGenerics.types       |   4 +-
 .../reference/implicitAnyWidenToAny.types     |   8 +-
 .../reference/implicitConstParameters.types   |  20 +-
 .../reference/implicitIndexSignatures.types   |   8 +-
 .../reference/importAliasIdentifiers.types    |  16 +-
 .../importAssertion1(module=commonjs).types   |  40 +-
 .../importAssertion1(module=es2015).types     |  40 +-
 .../importAssertion1(module=esnext).types     |  40 +-
 .../importAssertionNonstring.errors.txt       |   4 +-
 .../reference/importAssertionNonstring.types  |   4 +-
 .../importAttributes1(module=commonjs).types  |  40 +-
 .../importAttributes1(module=es2015).types    |  40 +-
 .../importAttributes1(module=esnext).types    |  40 +-
 .../reference/importAttributes6.errors.txt    |   4 +-
 .../reference/importAttributes6.types         |   4 +-
 .../reference/importAttributes7.types         |  12 +-
 .../reference/importAttributes9.types         |   4 +-
 .../importCallExpression1ES2020.types         |  16 +-
 .../importCallExpression2ES2020.types         |   4 +-
 .../importCallExpression3ES2020.types         |   4 +-
 .../importCallExpression4ES2020.types         |  12 +-
 .../importCallExpression5ES2020.errors.txt    |   4 +-
 .../importCallExpression5ES2020.types         |   8 +-
 .../importCallExpression6ES2020.types         |   8 +-
 .../importCallExpressionAsyncES2020.types     |  20 +-
 .../importCallExpressionAsyncES5AMD.types     |  20 +-
 .../importCallExpressionAsyncES5CJS.types     |  20 +-
 .../importCallExpressionAsyncES5System.types  |  20 +-
 .../importCallExpressionAsyncES5UMD.types     |  20 +-
 .../importCallExpressionAsyncES6AMD.types     |  20 +-
 .../importCallExpressionAsyncES6CJS.types     |  20 +-
 .../importCallExpressionAsyncES6System.types  |  20 +-
 .../importCallExpressionAsyncES6UMD.types     |  20 +-
 ...importCallExpressionCheckReturntype1.types |  12 +-
 ...importCallExpressionDeclarationEmit1.types |   4 +-
 ...importCallExpressionDeclarationEmit2.types |   4 +-
 ...importCallExpressionDeclarationEmit3.types |  12 +-
 .../importCallExpressionES5AMD.types          |  24 +-
 .../importCallExpressionES5CJS.types          |  24 +-
 .../importCallExpressionES5System.types       |  24 +-
 .../importCallExpressionES5UMD.types          |  24 +-
 .../importCallExpressionES6AMD.types          |  24 +-
 .../importCallExpressionES6CJS.types          |  24 +-
 .../importCallExpressionES6System.types       |  24 +-
 .../importCallExpressionES6UMD.types          |  24 +-
 .../importCallExpressionErrorInES2015.types   |  12 +-
 .../importCallExpressionGrammarError.types    |   4 +-
 .../importCallExpressionInAMD1.types          |  16 +-
 .../importCallExpressionInAMD2.types          |   4 +-
 .../importCallExpressionInAMD3.types          |   4 +-
 .../importCallExpressionInAMD4.types          |  24 +-
 .../importCallExpressionInCJS1.types          |  16 +-
 .../importCallExpressionInCJS2.types          |   8 +-
 .../importCallExpressionInCJS3.types          |   4 +-
 .../importCallExpressionInCJS4.types          |   4 +-
 .../importCallExpressionInCJS5.types          |  24 +-
 ...mportCallExpressionInExportEqualsAMD.types |   4 +-
 ...mportCallExpressionInExportEqualsCJS.types |   4 +-
 ...mportCallExpressionInExportEqualsUMD.types |   4 +-
 ...importCallExpressionInScriptContext1.types |   4 +-
 ...importCallExpressionInScriptContext2.types |   4 +-
 .../importCallExpressionInSystem1.types       |  16 +-
 .../importCallExpressionInSystem2.types       |   4 +-
 .../importCallExpressionInSystem3.types       |   4 +-
 .../importCallExpressionInSystem4.types       |  24 +-
 .../importCallExpressionInUMD1.types          |  16 +-
 .../importCallExpressionInUMD2.types          |   4 +-
 .../importCallExpressionInUMD3.types          |   4 +-
 .../importCallExpressionInUMD4.types          |  24 +-
 .../importCallExpressionNestedAMD.types       |   4 +-
 .../importCallExpressionNestedAMD2.types      |   4 +-
 .../importCallExpressionNestedCJS.types       |   4 +-
 .../importCallExpressionNestedCJS2.types      |   4 +-
 .../importCallExpressionNestedES2015.types    |   4 +-
 .../importCallExpressionNestedES20152.types   |   4 +-
 .../importCallExpressionNestedES2020.types    |   4 +-
 .../importCallExpressionNestedES20202.types   |   4 +-
 .../importCallExpressionNestedSystem.types    |   4 +-
 .../importCallExpressionNestedSystem2.types   |   4 +-
 .../importCallExpressionNestedUMD.types       |   4 +-
 .../importCallExpressionNestedUMD2.types      |   4 +-
 ...tCallExpressionNoModuleKindSpecified.types |  12 +-
 ...portCallExpressionReturnPromiseOfAny.types |  16 +-
 ...sionSpecifierNotStringTypeError.errors.txt |   4 +-
 ...xpressionSpecifierNotStringTypeError.types |  16 +-
 ...importCallExpressionWithTypeArgument.types |   8 +-
 .../reference/importClause_default.types      |   4 +-
 .../importClause_namespaceImport.types        |   4 +-
 .../reference/importHelpersES6.types          |   4 +-
 .../reference/importInTypePosition.types      |   8 +-
 .../reference/importStatements.types          |  16 +-
 .../reference/importTsBeforeDTs.types         |   4 +-
 .../reference/importTypeAmbient.types         |  16 +-
 .../reference/importTypeGenericTypes.types    |  24 +-
 .../baselines/reference/importTypeLocal.types |  16 +-
 .../import_reference-exported-alias.types     |   4 +-
 .../import_reference-to-type-alias.types      |   4 +-
 .../reference/importsImplicitlyReadonly.types |  32 +-
 .../inKeywordTypeguard(strict=false).types    |  16 +-
 .../inKeywordTypeguard(strict=true).types     |  16 +-
 ...rOfTypeArgumentsDuringErrorReporting.types |   8 +-
 .../reference/incrementOnNullAssertion.types  |   8 +-
 .../incrementOperatorWithNumberType.types     |   8 +-
 ...ratorWithNumberTypeInvalidOperations.types |  12 +-
 ...entOperatorWithUnsupportedStringType.types |  12 +-
 .../reference/indexAt(target=es2022).types    |  52 +-
 .../reference/indexAt(target=esnext).types    |  52 +-
 .../reference/indexIntoArraySubclass.types    |   8 +-
 .../indexSignatureWithInitializer1.types      |   4 +-
 .../reference/indexSignatures1.types          |  42 +-
 .../indexSignaturesInferentialTyping.types    |  24 +-
 .../reference/indexedAccessConstraints.types  |   4 +-
 .../indexedAccessRetainsIndexSignature.types  |   4 +-
 .../indexedAccessWithFreshObjectLiteral.types |  16 +-
 tests/baselines/reference/indexer.types       |   8 +-
 tests/baselines/reference/indexerA.types      |   8 +-
 .../reference/indexerWithTuple.types          |  32 +-
 .../reference/indexingTypesWithNever.types    |  24 +-
 ...ndirectDiscriminantAndExcessProperty.types |  12 +-
 .../indirectTypeParameterReferences.types     |   8 +-
 ...inferFromGenericFunctionReturnTypes1.types |  16 +-
 ...inferFromGenericFunctionReturnTypes2.types |  12 +-
 ...inferFromGenericFunctionReturnTypes3.types |  40 +-
 .../inferFromNestedSameShapeTuple.types       |  60 +-
 ...erObjectTypeFromStringLiteralToKeyof.types |  12 +-
 ...erParameterWithMethodCallInitializer.types |   8 +-
 ...yWithContextSensitiveReturnStatement.types |   4 +-
 .../inferRestArgumentsMappedTuple.types       |  16 +-
 .../reference/inferSecondaryParameter.types   |   2 +-
 .../reference/inferSetterParamType.types      |   4 +-
 .../inferTupleFromBindingPattern.types        |   8 +-
 .../inferTypeParameterConstraints.types       |   4 +-
 .../reference/inferTypePredicates.types       |  44 +-
 tests/baselines/reference/inferTypes1.types   |   4 +-
 .../inferenceFromIncompleteSource.types       |   4 +-
 .../inferenceFromParameterlessLambda.types    |   4 +-
 ...eOptionalPropertiesToIndexSignatures.types |   4 +-
 ...correctlyInstantiatedWithInnerResult.types |   4 +-
 .../inferenceShouldFailOnEvolvingArrays.types |  20 +-
 ...ceUnionOfObjectsMappedContextualType.types |   8 +-
 ...nferentialTypingObjectLiteralMethod1.types |   4 +-
 ...nferentialTypingObjectLiteralMethod2.types |   4 +-
 .../inferentialTypingWithFunctionType.types   |   4 +-
 ...erentialTypingWithFunctionTypeNested.types |   4 +-
 ...ngWithFunctionTypeSyntacticScenarios.types |  32 +-
 ...inferentialTypingWithFunctionTypeZip.types |  16 +-
 ...ialTypingWithObjectLiteralProperties.types |  24 +-
 ...urnTypeFromConstructSignatureGeneric.types |  12 +-
 .../reference/infiniteConstraints.types       |   2 +-
 tests/baselines/reference/inheritance.types   |   8 +-
 ...anceMemberAccessorOverridingAccessor.types |   8 +-
 ...anceMemberAccessorOverridingProperty.types |   4 +-
 ...eritanceMemberFuncOverridingAccessor.types |   4 +-
 ...anceStaticAccessorOverridingAccessor.types |   8 +-
 ...itanceStaticAccessorOverridingMethod.types |   4 +-
 ...anceStaticAccessorOverridingProperty.types |   4 +-
 ...eritanceStaticFuncOverridingAccessor.types |   4 +-
 .../inheritedConstructorWithRestParams.types  |  24 +-
 .../inheritedConstructorWithRestParams2.types | 120 +--
 .../inheritedModuleMembersForClodule.types    |   8 +-
 ...ritedOverloadedSpecializedSignatures.types |  12 +-
 .../initializerWithThisPropertyAccess.types   |   8 +-
 ...lineJsxFactoryDeclarationsLocalTypes.types |  80 +-
 ...iasAssignableToConstraintSameAsAlias.types |   4 +-
 .../baselines/reference/innerOverloads.types  |   4 +-
 .../innerTypeCheckOfLambdaArgument.types      |   4 +-
 .../instanceAndStaticDeclarations1.types      |   8 +-
 ...nstanceMemberAssignsToClassPrototype.types |   8 +-
 .../instanceMemberInitialization.types        |   8 +-
 ...ancePropertiesInheritedIntoClassType.types |  32 +-
 .../instancePropertyInClassType.types         |  32 +-
 ...anceofWithStructurallyIdenticalTypes.types |   8 +-
 .../instantiateContextualTypes.types          |  12 +-
 ...tantiateContextuallyTypedGenericThis.types |   8 +-
 .../reference/instantiateCrossFileMerge.types |   4 +-
 .../reference/instantiatedModule.types        |   8 +-
 tests/baselines/reference/interface0.types    |   4 +-
 .../reference/interfaceAssignmentCompat.types |   8 +-
 .../reference/interfaceClassMerging.types     |  16 +-
 .../reference/interfaceDeclaration1.types     |   4 +-
 .../reference/interfaceImplementation5.types  |   4 +-
 .../reference/interfaceImplementation6.types  |   4 +-
 .../reference/interfaceImplementation7.types  |   4 +-
 ...OverloadedCallAndConstructSignatures.types |   8 +-
 .../interfaceWithPropertyOfEveryType.types    |  16 +-
 ...pecializedCallAndConstructSignatures.types |   8 +-
 ...liasClassInsideLocalModuleWithExport.types |   4 +-
 ...sClassInsideLocalModuleWithoutExport.types |   4 +-
 ...eLocalModuleWithoutExportAccessError.types |   4 +-
 ...sClassInsideTopLevelModuleWithExport.types |   4 +-
 ...assInsideTopLevelModuleWithoutExport.types |   4 +-
 .../reference/internalAliasFunction.types     |   4 +-
 ...sFunctionInsideLocalModuleWithExport.types |   4 +-
 ...nctionInsideLocalModuleWithoutExport.types |   4 +-
 ...eLocalModuleWithoutExportAccessError.types |   4 +-
 ...nctionInsideTopLevelModuleWithExport.types |   4 +-
 ...ionInsideTopLevelModuleWithoutExport.types |   4 +-
 .../intersectionAsWeakTypeSource.types        |  16 +-
 .../reference/intersectionPropertyCheck.types |   8 +-
 .../intersectionSatisfiesConstraint.types     |   4 +-
 .../reference/intersectionThisTypes.types     |   8 +-
 .../reference/intersectionTypeInference.types |  16 +-
 .../intersectionTypeInference1.types          |   4 +-
 .../reference/intersectionTypeMembers.types   |  96 +--
 .../intersectionTypeOverloading.types         |   4 +-
 .../reference/intersectionTypeReadonly.types  |   8 +-
 ...rsectionType_useDefineForClassFields.types |   4 +-
 .../intersectionWithIndexSignatures.types     |   4 +-
 .../intersectionsAndEmptyObjects.types        |   2 +-
 .../intersectionsAndOptionalProperties.types  |   4 +-
 .../intersectionsAndReadonlyProperties.types  |  16 +-
 .../reference/intlNumberFormatES2020.types    |  10 +-
 .../reference/intraExpressionInferences.types |  76 +-
 .../intraExpressionInferencesJsx.types        |  36 +-
 .../reference/intrinsicKeyword.types          |   4 +-
 .../invalidModuleWithVarStatements.types      |  12 +-
 .../invalidMultipleVariableDeclarations.types |   4 +-
 .../reference/invalidReturnStatements.types   |   4 +-
 tests/baselines/reference/invalidSplice.types |   8 +-
 ...ocationExpressionInFunctionParameter.types |   4 +-
 tests/baselines/reference/ipromise2.types     |   4 +-
 tests/baselines/reference/ipromise4.types     |   4 +-
 tests/baselines/reference/isLiteral1.types    |   4 +-
 .../isolatedDeclarationErrorsClasses.types    |  20 +-
 ...dDeclarationErrorsClassesExpressions.types |   4 +-
 .../isolatedDeclarationErrorsEnums.types      |  16 +-
 ...isolatedDeclarationErrorsExpressions.types |  28 +-
 .../isolatedDeclarationErrorsObjects.types    |  16 +-
 ...isolatedDeclarationErrorsReturnTypes.types | 168 ++--
 .../isolatedDeclarationLazySymbols.types      |   4 +-
 .../isolatedDeclarationOutFile.types          |   4 +-
 .../isolatedDeclarationsAddUndefined.types    |   4 +-
 .../isolatedModulesNoEmitOnError.types        |   4 +-
 .../isolatedModulesPlainFile-AMD.types        |   4 +-
 .../isolatedModulesPlainFile-CommonJS.types   |   4 +-
 .../isolatedModulesPlainFile-ES6.types        |   4 +-
 .../isolatedModulesPlainFile-System.types     |   4 +-
 .../isolatedModulesPlainFile-UMD.types        |   4 +-
 .../isomorphicMappedTypeInference.types       |  96 +--
 .../reference/iterableArrayPattern23.types    |   4 +-
 .../reference/iterableArrayPattern24.types    |   4 +-
 .../reference/iterableArrayPattern25.types    |  16 +-
 .../reference/iterableArrayPattern26.types    |  16 +-
 .../reference/iterableArrayPattern27.types    |  16 +-
 .../reference/iterableArrayPattern28.types    |  12 +-
 .../reference/iterableArrayPattern29.types    |   8 +-
 .../reference/iterableArrayPattern30.types    |   8 +-
 .../reference/iteratorSpreadInArray5.types    |   8 +-
 .../reference/iteratorSpreadInArray6.types    |   8 +-
 ...ClassImplementsGenericsSerialization.types |   4 +-
 .../jsDeclarationsClassStatic2.types          |   8 +-
 .../reference/jsDeclarationsClasses.types     |   8 +-
 .../reference/jsDeclarationsEnumTag.types     |  16 +-
 ...ignedClassExpressionAnonymousWithSub.types |   4 +-
 ...rtAssignedConstructorFunctionWithSub.types |   4 +-
 .../jsDeclarationsFunctionLikeClasses2.types  |  12 +-
 .../jsDeclarationsImportTypeBundled.types     |   8 +-
 ...jsDeclarationsJSDocRedirectedLookups.types |  16 +-
 ...eclarationsOptionalTypeLiteralProps2.types |   8 +-
 .../jsDeclarationsReactComponents.types       |   4 +-
 ...assWithExplicitNoArgumentConstructor.types |   8 +-
 .../jsDeclarationsTypedefAndImportTypes.types |   8 +-
 ...nsTypedefPropertyAndExportAssignment.types |   8 +-
 .../jsDeclarationsUniqueSymbolUsage.types     |   4 +-
 .../reference/jsEnumCrossFileExport.types     |   8 +-
 ...jsExportAssignmentNonMutableLocation.types |   8 +-
 ...rtMemberMergedWithModuleAugmentation.types |   4 +-
 .../reference/jsFileClassPropertyType.types   |   8 +-
 .../reference/jsFileClassPropertyType2.types  |   4 +-
 .../reference/jsFileClassPropertyType3.types  |   8 +-
 .../jsFileCompilationAwaitModifier.types      |   8 +-
 ...jsFileCompilationLetDeclarationOrder.types |  16 +-
 ...sFileCompilationLetDeclarationOrder2.types |  16 +-
 .../jsFileCompilationTypeAssertions.types     |   4 +-
 .../reference/jsFileMethodOverloads3.types    |   8 +-
 .../jsObjectsMarkedAsOpenEnded.types          |   8 +-
 .../jsdocArrayObjectPromiseImplicitAny.types  |  12 +-
 ...jsdocArrayObjectPromiseNoImplicitAny.types |  12 +-
 .../reference/jsdocBracelessTypeTag1.types    |  16 +-
 .../jsdocDisallowedInTypescript.types         |  28 +-
 .../reference/jsdocFunctionType.types         |  32 +-
 .../reference/jsdocImplements_class.types     |   4 +-
 .../baselines/reference/jsdocImportType.types |   4 +-
 .../reference/jsdocImportType2.types          |   4 +-
 .../reference/jsdocParamTagTypeLiteral.types  |  28 +-
 .../jsdocPostfixEqualsAddsOptionality.types   |  24 +-
 tests/baselines/reference/jsdocReadonly.types |   4 +-
 .../reference/jsdocRestParameter.types        |  16 +-
 .../baselines/reference/jsdocReturnTag1.types |  20 +-
 .../reference/jsdocTemplateClass.types        |   4 +-
 .../jsdocTemplateConstructorFunction.types    |   4 +-
 .../jsdocTemplateConstructorFunction2.types   |  12 +-
 .../reference/jsdocTemplateTag.types          |   8 +-
 .../reference/jsdocTemplateTag3.types         |  16 +-
 .../reference/jsdocTemplateTag8.types         |  12 +-
 .../reference/jsdocTemplateTagDefault.types   |  16 +-
 .../jsdocTemplateTagNameResolution.types      |   4 +-
 .../jsdocTypeFromChainedAssignment.types      |  16 +-
 .../jsdocTypeFromChainedAssignment2.types     |  16 +-
 .../reference/jsdocTypeReferenceToValue.types |   8 +-
 .../reference/jsdocTypeTagCast.types          |  12 +-
 .../reference/jsdocTypeTagParameterType.types |  16 +-
 .../reference/jsdocTypedefMissingType.types   |   4 +-
 .../reference/jsdocVariadicType.types         |   4 +-
 .../baselines/reference/json.stringify.types  |  28 +-
 .../jsxChildrenGenericContextualTypes.types   |  24 +-
 ...onfusableWithMultipleChildrenNoError.types |   8 +-
 .../jsxElementClassTooManyParams.types        |   8 +-
 .../reference/jsxEmitWithAttributes.types     |   4 +-
 .../jsxFactoryAndReactNamespace.types         |   4 +-
 .../reference/jsxFactoryIdentifier.types      |   4 +-
 ...xFactoryNotIdentifierOrQualifiedName.types |   4 +-
 ...FactoryNotIdentifierOrQualifiedName2.types |   4 +-
 .../reference/jsxFactoryQualifiedName.types   |   4 +-
 .../jsxFragmentFactoryNoUnusedLocals.types    |   4 +-
 ...sxInferenceProducesLiteralAsExpected.types |   8 +-
 ...edUsingTemplateLiteralTypeSignatures.types |   4 +-
 ...sErrorWhenTagExpectsTooManyArguments.types |  16 +-
 .../reference/jsxPartialSpread.types          |   2 +-
 .../jsxSpreadOverwritesAttributeStrict.types  |  52 +-
 .../reference/keyRemappingKeyofResult.types   |   4 +-
 .../reference/keyofAndIndexedAccess.types     | 172 ++--
 .../reference/keyofAndIndexedAccess2.types    | 112 +--
 .../keyofAndIndexedAccessErrors.types         |   4 +-
 .../reference/keyofDoesntContainSymbols.types |   8 +-
 .../keyofIsLiteralContexualType.types         |  12 +-
 tests/baselines/reference/knockout.types      |  12 +-
 .../reference/lambdaParamTypes.types          |  30 +-
 .../baselines/reference/lambdaPropSelf.types  |   4 +-
 .../reference/lastPropertyInLiteralWins.types |   4 +-
 ...teBoundAssignmentDeclarationSupport7.types |  25 +-
 .../lateBoundClassMemberAssignmentJS.types    |   2 +-
 .../lateBoundClassMemberAssignmentJS3.types   |   2 +-
 ...FunctionMemberAssignmentDeclarations.types |   8 +-
 .../lateBoundMethodNameAssigmentJS.types      |   2 +-
 ...ExportsSpecifierGenerationConditions.types |   4 +-
 .../baselines/reference/letAsIdentifier.types |   8 +-
 .../letAsIdentifierInStrictMode.types         |   8 +-
 .../reference/letDeclarations-access.types    |   8 +-
 .../reference/letDeclarations-es5-1.types     |   8 +-
 .../reference/letDeclarations-es5.types       |   8 +-
 .../baselines/reference/letDeclarations.types |   8 +-
 tests/baselines/reference/libMembers.types    |  16 +-
 .../reference/libReferenceNoLib.types         |   4 +-
 .../reference/libReferenceNoLibBundle.types   |   4 +-
 .../libTypeScriptOverrideSimple.types         |   4 +-
 .../libTypeScriptOverrideSimpleConfig.types   |   4 +-
 .../libTypeScriptSubfileResolving.types       |   4 +-
 .../libTypeScriptSubfileResolvingConfig.types |   4 +-
 .../reference/library_ArraySlice.types        |  12 +-
 .../library_DatePrototypeProperties.types     |  60 +-
 .../library_RegExpExecArraySlice.types        |  12 +-
 .../reference/library_StringSlice.types       |  12 +-
 ...literalTypesWidenInParameterPosition.types |  12 +-
 tests/baselines/reference/localTypes1.types   |  24 +-
 tests/baselines/reference/localTypes2.types   |  24 +-
 tests/baselines/reference/localTypes3.types   |  24 +-
 tests/baselines/reference/localTypes4.types   |  24 +-
 .../reference/localesObjectArgument.types     |   8 +-
 .../logicalAssignment1(target=es2015).types   |  30 +-
 .../logicalAssignment1(target=es2020).types   |  30 +-
 .../logicalAssignment1(target=es2021).types   |  30 +-
 .../logicalAssignment1(target=esnext).types   |  30 +-
 .../logicalAssignment11(target=es2015).types  |   8 +-
 .../logicalAssignment11(target=es2020).types  |   8 +-
 .../logicalAssignment11(target=esnext).types  |   8 +-
 .../logicalAssignment4(target=es2015).types   |  16 +-
 .../logicalAssignment4(target=es2020).types   |  16 +-
 .../logicalAssignment4(target=es2021).types   |  16 +-
 .../logicalAssignment4(target=esnext).types   |  16 +-
 .../logicalAssignment5(target=es2015).types   |  24 +-
 .../logicalAssignment5(target=es2020).types   |  24 +-
 .../logicalAssignment5(target=es2021).types   |  24 +-
 .../logicalAssignment5(target=esnext).types   |  24 +-
 .../logicalAssignment6(target=es2015).types   |  12 +-
 .../logicalAssignment6(target=es2020).types   |  12 +-
 .../logicalAssignment6(target=es2021).types   |  12 +-
 .../logicalAssignment6(target=esnext).types   |  12 +-
 .../logicalAssignment7(target=es2015).types   |  12 +-
 .../logicalAssignment7(target=es2020).types   |  12 +-
 .../logicalAssignment7(target=es2021).types   |  12 +-
 .../logicalAssignment7(target=esnext).types   |  12 +-
 .../logicalAssignment8(target=es2015).types   |  12 +-
 .../logicalAssignment8(target=es2020).types   |  12 +-
 .../logicalAssignment8(target=es2021).types   |  12 +-
 .../logicalAssignment8(target=esnext).types   |  12 +-
 .../logicalNotOperatorWithNumberType.types    |  12 +-
 .../logicalNotOperatorWithStringType.types    |  16 +-
 ...gicalOrExpressionIsContextuallyTyped.types |   8 +-
 .../reference/looseThisTypeInFunctions.types  |  12 +-
 .../baselines/reference/mapConstructor.types  |  32 +-
 tests/baselines/reference/mapGroupBy.types    |  12 +-
 .../reference/mapOnTupleTypes01.types         | 104 +--
 .../reference/mappedTypeAsClauses.types       |   4 +-
 .../mappedTypeContextualTypesApplied.types    |  12 +-
 .../reference/mappedTypeErrors.types          | 136 +--
 .../mappedTypeGenericWithKnownKeys.types      |  12 +-
 .../reference/mappedTypeIndexedAccess.types   |   8 +-
 .../reference/mappedTypeInferenceErrors.types |  12 +-
 .../reference/mappedTypeModifiers.types       |   4 +-
 ...mappedTypeNestedGenericInstantiation.types |   8 +-
 .../mappedTypeNotMistakenlyHomomorphic.types  |  16 +-
 .../mappedTypeOverlappingStringEnumKeys.types |   8 +-
 ...ePartialNonHomomorphicBaseConstraint.types |   4 +-
 .../reference/mappedTypeRelationships.types   |   4 +-
 .../mappedTypeUnionConstraintInferences.types |   4 +-
 tests/baselines/reference/mappedTypes2.types  |  16 +-
 tests/baselines/reference/mappedTypes6.types  | 104 +--
 .../reference/mappedTypesGenericTuples2.types |   4 +-
 .../matchReturnTypeInAllBranches.types        |  28 +-
 .../matchingOfObjectLiteralConstraints.types  |   8 +-
 .../memberAccessMustUseModuleInstances.types  |   4 +-
 .../memberFunctionsWithPrivateOverloads.types |  16 +-
 ...rFunctionsWithPublicPrivateOverloads.types |   8 +-
 .../mergeSymbolReexportInterface.types        |   4 +-
 ...mbolReexportedTypeAliasInstantiation.types |   4 +-
 .../reference/mergedDeclarations1.types       |  16 +-
 .../mergedInstantiationAssignment.types       |  24 +-
 .../reference/methodChainError.types          |  12 +-
 ...ExplicitTypeParameterAndArgumentType.types |  24 +-
 .../missingCloseBracketInArray.types          |  16 +-
 .../reference/mixinClassesAnnotated.types     |  48 +-
 .../reference/mixinClassesAnonymous.types     |  44 +-
 .../reference/mixinClassesMembers.types       |  56 +-
 .../reference/mixinPrivateAndProtected.types  |  32 +-
 .../mixingApparentTypeOverrides.types         |   8 +-
 ...FromUsingES6ArrayWithOnlyES6ArrayLib.types |  12 +-
 ...orFromUsingES6FeaturesWithOnlyES5Lib.types |  12 +-
 ...wnSymbolWithOutES6WellknownSymbolLib.types |  12 +-
 ...eLibrary_NoErrorDuplicateLibOptions1.types |  24 +-
 ...eLibrary_NoErrorDuplicateLibOptions2.types |  24 +-
 ...dularizeLibrary_TargetES5UsingES6Lib.types |  24 +-
 ...dularizeLibrary_TargetES6UsingES6Lib.types |  24 +-
 ...izeLibrary_UsingES5LibAndES6ArrayLib.types |  12 +-
 ...5LibES6ArrayLibES6WellknownSymbolLib.types |  12 +-
 .../reference/moduleCodeGenTest3.types        |   8 +-
 .../reference/moduleCodegenTest4.types        |   8 +-
 .../moduleDuplicateIdentifiers.types          |   8 +-
 .../reference/moduleExportAlias2.types        |   4 +-
 .../reference/moduleExportAliasImported.types |   4 +-
 .../reference/moduleExportAssignment.types    |   8 +-
 .../reference/moduleExportAssignment6.types   |   8 +-
 ...leExportWithExportPropertyAssignment.types |   4 +-
 ...eExportWithExportPropertyAssignment2.types |   8 +-
 ...eExportWithExportPropertyAssignment3.types |   4 +-
 ...eExportWithExportPropertyAssignment4.types |   4 +-
 .../baselines/reference/moduleExports1.types  |   8 +-
 tests/baselines/reference/moduleMerge.types   |   8 +-
 ...duleNoneDynamicImport(target=es2015).types |   4 +-
 ...duleNoneDynamicImport(target=es2020).types |   4 +-
 .../baselines/reference/modulePreserve4.types |  12 +-
 .../moduleResolutionWithoutExtension5.types   |   4 +-
 .../moduleResolutionWithoutExtension8.types   |   4 +-
 .../moduleWithStatementsOfEveryKind.types     |   8 +-
 .../multiExtendsSplitInterfaces1.types        |   4 +-
 .../reference/multiModuleFundule1.types       |   8 +-
 tests/baselines/reference/multiline.types     |  40 +-
 .../reference/multipleInferenceContexts.types |   4 +-
 .../reference/multipleInheritance.types       |   8 +-
 .../reference/multipleNumericIndexers.types   |   8 +-
 .../reference/multipleStringIndexers.types    |   4 +-
 tests/baselines/reference/multivar.types      |   8 +-
 ...amespaceMergedWithImportAliasNoCrash.types |   4 +-
 .../reference/narrowByBooleanComparison.types |   4 +-
 ...arrowByClauseExpressionInSwitchTrue7.types |  16 +-
 ...arrowByClauseExpressionInSwitchTrue9.types |   4 +-
 .../reference/narrowByEquality.types          |   4 +-
 ...alse,nouncheckedindexedaccess=false).types |   4 +-
 ...false,nouncheckedindexedaccess=true).types |   4 +-
 ...true,nouncheckedindexedaccess=false).types |   4 +-
 ...=true,nouncheckedindexedaccess=true).types |   4 +-
 ...gAssignmentReadonlyRespectsAssertion.types |  64 +-
 .../reference/narrowingByTypeofInSwitch.types |  40 +-
 .../narrowingConstrainedTypeParameter.types   |   4 +-
 .../reference/narrowingOfDottedNames.types    |  20 +-
 .../reference/narrowingOrderIndependent.types |   4 +-
 .../narrowingPastLastAssignment.types         | 132 +--
 .../narrowingPastLastAssignmentInModule.types |  40 +-
 .../negateOperatorWithNumberType.types        |  12 +-
 .../negateOperatorWithStringType.types        |  16 +-
 .../nestedExcessPropertyChecking.types        |  20 +-
 .../nestedGenericSpreadInference.types        |   4 +-
 tests/baselines/reference/nestedLoops.types   |  24 +-
 tests/baselines/reference/nestedModules.types |   8 +-
 ...estedRecursiveArraysOrObjectsError01.types |   2 +-
 .../nestedRedeclarationInES6AMD.types         |   8 +-
 .../baselines/reference/neverInference.types  |   8 +-
 .../reference/neverReturningFunctions1.types  |  46 +-
 tests/baselines/reference/neverType.types     |  24 +-
 .../reference/neverTypeErrors1.types          |  20 +-
 .../reference/neverTypeErrors2.types          |  20 +-
 .../reference/newLineFlagWithCRLF.types       |   8 +-
 .../reference/newLineFlagWithLF.types         |   8 +-
 .../reference/newOperatorConformance.types    |   4 +-
 .../reference/newOperatorErrorCases.types     |   4 +-
 .../newOperatorErrorCases_noImplicitAny.types |   4 +-
 tests/baselines/reference/newWithSpread.types | 360 ++++----
 .../reference/newWithSpreadES5.types          | 360 ++++----
 .../reference/newWithSpreadES6.types          | 360 ++++----
 .../reference/noCheckDoesNotReportError.types |   4 +-
 tests/baselines/reference/noCheckNoEmit.types |   4 +-
 .../noCheckRequiresEmitDeclarationOnly.types  |   4 +-
 ...ThisExpressionAndLocalVarInAccessors.types |   8 +-
 .../reference/noCrashOnImportShadowing.types  |   8 +-
 .../reference/noCrashOnThisTypeUsage.types    |   4 +-
 tests/baselines/reference/noEmitOnError.types |   4 +-
 .../noImplicitAnyInCastExpression.types       |   4 +-
 ...yInContextuallyTypesFunctionParamter.types |   4 +-
 .../reference/noImplicitAnyIndexing.types     |  12 +-
 .../noImplicitAnyIndexingSuppressed.types     |  12 +-
 .../noImplicitReturnsExclusions.types         |   8 +-
 .../reference/noImplicitReturnsInAsync1.types |   4 +-
 ...oImplicitReturnsWithProtectedBlocks1.types |   4 +-
 ...oImplicitReturnsWithProtectedBlocks2.types |   8 +-
 ...oImplicitReturnsWithProtectedBlocks3.types |   4 +-
 tests/baselines/reference/noInfer.types       |  24 +-
 .../noInferUnionExcessPropertyCheck1.types    |  48 +-
 .../reference/noObjectKeysToKeyofT.types      |   4 +-
 .../reference/noUncheckedIndexedAccess.types  |   8 +-
 .../reference/noUnusedLocals_writeOnly.types  |  48 +-
 ...ocals_writeOnlyProperty_dynamicNames.types |  16 +-
 .../nodeModules1(module=node16).types         | 132 +--
 .../nodeModules1(module=nodenext).types       | 132 +--
 .../nodeModulesAllowJs1(module=node16).types  | 132 +--
 ...nodeModulesAllowJs1(module=nodenext).types | 132 +--
 ...sAllowJsDynamicImport(module=node16).types |   8 +-
 ...llowJsDynamicImport(module=nodenext).types |   8 +-
 ...SynchronousCallErrors(module=node16).types |  16 +-
 ...nchronousCallErrors(module=nodenext).types |  16 +-
 ...nEmitDynamicImportWithPackageExports.types |  72 +-
 ...eModulesDynamicImport(module=node16).types |   8 +-
 ...odulesDynamicImport(module=nodenext).types |   8 +-
 ...ksSpecifierResolution(module=node16).types |   4 +-
 ...SpecifierResolution(module=nodenext).types |   4 +-
 ...odulesExportsSourceTs(module=node16).types |   4 +-
 ...ulesExportsSourceTs(module=nodenext).types |   4 +-
 ...rGenerationConditions(module=node16).types |   4 +-
 ...enerationConditions(module=nodenext).types |   4 +-
 ...erGenerationDirectory(module=node16).types |   4 +-
 ...GenerationDirectory(module=nodenext).types |   4 +-
 ...fierGenerationPattern(module=node16).types |   4 +-
 ...erGenerationPattern(module=nodenext).types |   4 +-
 ...dulesImportAssertions(module=node16).types |   6 +-
 ...lesImportAssertions(module=nodenext).types |   6 +-
 ...dulesImportAttributes(module=node16).types |   6 +-
 ...lesImportAttributes(module=nodenext).types |   6 +-
 ...DeclarationEmitErrors(module=node16).types |  12 +-
 ...clarationEmitErrors(module=nodenext).types |  12 +-
 ...eclarationEmitErrors1(module=node16).types |  12 +-
 ...larationEmitErrors1(module=nodenext).types |  12 +-
 ...SynchronousCallErrors(module=node16).types |  16 +-
 ...nchronousCallErrors(module=nodenext).types |  16 +-
 .../nodeNextCjsNamespaceImportDefault1.types  |   4 +-
 .../nodeNextCjsNamespaceImportDefault2.types  |   4 +-
 .../reference/nonInstantiatedModule.types     |   8 +-
 .../reference/nonIterableRestElement1.types   |   8 +-
 .../reference/nonIterableRestElement2.types   |   8 +-
 .../reference/nonIterableRestElement3.types   |   8 +-
 .../reference/nonNullableReduction.types      |   8 +-
 .../nonNullableReductionNonStrict.types       |   8 +-
 ...ObjectUnionNestedExcessPropertyCheck.types |   6 +-
 .../nonPrimitiveUnionIntersection.types       |   4 +-
 ...ullAssertionPropegatesContextualType.types |   4 +-
 .../normalizedIntersectionTooComplex.types    |   4 +-
 tests/baselines/reference/null.types          |   4 +-
 ...UndefinedTypeGuardIsOrderIndependent.types |   4 +-
 .../nullishCoalescingOperator1.types          |  32 +-
 .../nullishCoalescingOperator10.types         |   4 +-
 .../nullishCoalescingOperator2.types          |  16 +-
 .../nullishCoalescingOperator6.types          |   4 +-
 .../nullishCoalescingOperator7.types          |  28 +-
 .../nullishCoalescingOperator8.types          |  12 +-
 .../nullishCoalescingOperator_es2020.types    |  16 +-
 ...nullishCoalescingOperator_not_strict.types |  16 +-
 .../baselines/reference/numberToString.types  |   8 +-
 .../reference/numberVsBigIntOperations.types  |  32 +-
 .../reference/numericEnumMappedType.types     |  32 +-
 .../reference/numericIndexExpressions.types   |  32 +-
 ...rConstrainsPropertyDeclarations.errors.txt |   7 +-
 ...ndexerConstrainsPropertyDeclarations.types |   8 +-
 ...dexerConstrainsPropertyDeclarations2.types |   8 +-
 .../reference/numericIndexingResults.types    |  16 +-
 .../reference/numericLiteralTypes1.types      |   8 +-
 .../reference/numericLiteralTypes2.types      |   8 +-
 ...cLiteralsWithTrailingDecimalPoints01.types |   4 +-
 ...cLiteralsWithTrailingDecimalPoints02.types |   4 +-
 .../reference/numericStringLiteralTypes.types |   8 +-
 .../objectAssignLikeNonUnionResult.types      |   8 +-
 ...reationExpressionInFunctionParameter.types |   4 +-
 ...ectCreationOfElementAccessExpression.types |  48 +-
 tests/baselines/reference/objectFreeze.types  |  24 +-
 .../reference/objectFromEntries.types         |  68 +-
 tests/baselines/reference/objectGroupBy.types |  12 +-
 .../reference/objectLitArrayDeclNoNew.types   |   4 +-
 .../reference/objectLitGetterSetter.types     |   4 +-
 .../objectLitTargetTypeCallSite.types         |   4 +-
 .../objectLiteralArraySpecialization.types    |  14 +-
 .../objectLiteralContextualTyping.types       |  12 +-
 .../objectLiteralEnumPropertyNames.types      |  40 +-
 .../reference/objectLiteralErrors.types       |   8 +-
 .../objectLiteralExcessProperties.types       |  22 +-
 ...ctLiteralFunctionArgContextualTyping.types |  12 +-
 ...tLiteralFunctionArgContextualTyping2.types |  12 +-
 .../objectLiteralNormalization.types          |  64 +-
 .../objectLiteralParameterResolution.types    |  16 +-
 .../objectLiteralPropertyImplicitlyAny.types  |   4 +-
 ...LiteralShorthandPropertiesAssignment.types |  32 +-
 ...eralShorthandPropertiesAssignmentES6.types |  32 +-
 ...alShorthandPropertiesAssignmentError.types |   8 +-
 ...AssignmentErrorFromMissingIdentifier.types |  16 +-
 ...lShorthandPropertiesFunctionArgument.types |   8 +-
 ...ShorthandPropertiesFunctionArgument2.types |   8 +-
 ...tLiteralWithNumericPropertyName.errors.txt |  11 +-
 ...objectLiteralWithNumericPropertyName.types |   4 +-
 ...bjectLiteralsAgainstUnionsOfArrays01.types |   4 +-
 tests/baselines/reference/objectRest.types    |  12 +-
 tests/baselines/reference/objectRest2.types   |   2 +-
 .../baselines/reference/objectRestForOf.types |   4 +-
 .../reference/objectRestParameter.types       |   4 +-
 .../reference/objectRestParameterES5.types    |   4 +-
 .../objectRestPropertyMustBeLast.types        |   8 +-
 .../reference/objectRestReadonly.types        |  10 +-
 tests/baselines/reference/objectSpread.types  | 106 +--
 .../objectSpreadComputedProperty.types        |   8 +-
 .../objectSpreadIndexSignature.types          |   8 +-
 .../reference/objectSpreadNegative.errors.txt |   4 +-
 .../reference/objectSpreadNegative.types      |  56 +-
 .../objectSpreadRepeatedNullCheckPerf.types   |  12 +-
 .../objectSpreadSetonlyAccessor.types         |   8 +-
 ...dingMembersOfObjectAssignmentCompat2.types |   4 +-
 ...ectTypesIdentityWithNumericIndexers1.types |   4 +-
 ...ectTypesIdentityWithNumericIndexers3.types |   4 +-
 ...bjectTypesIdentityWithStringIndexers.types |   4 +-
 .../reference/omitTypeHelperModifiers01.types |   8 +-
 .../operatorsAndIntersectionTypes.types       |  20 +-
 .../optionalAccessorsInInterface1.types       |   4 +-
 .../optionalArgsWithDefaultValues.types       |   4 +-
 .../optionalBindingParameters1.types          |  12 +-
 .../optionalBindingParameters2.types          |  12 +-
 .../optionalBindingParameters3.types          |   4 +-
 ...ptionalBindingParametersInOverloads1.types |  12 +-
 ...ptionalBindingParametersInOverloads2.types |  12 +-
 .../baselines/reference/optionalMethods.types |   4 +-
 .../reference/optionalParamArgsTest.types     | 228 ++---
 ...ameterInDestructuringWithInitializer.types |  96 +--
 ...tionalParamterAndVariableDeclaration.types |   4 +-
 ...ionalParamterAndVariableDeclaration2.types |   4 +-
 .../reference/optionalProperties01.types      |  12 +-
 .../reference/optionalPropertiesTest.types    |  28 +-
 .../reference/optionalTupleElements1.types    |  40 +-
 ...rderMattersForSignatureGroupIdentity.types |  16 +-
 tests/baselines/reference/out-flag.types      |   4 +-
 .../outFilerootDirModuleNamesAmd.types        |   4 +-
 .../outFilerootDirModuleNamesSystem.types     |   4 +-
 tests/baselines/reference/overload1.types     |  34 +-
 .../reference/overloadAssignmentCompat.types  |  12 +-
 .../reference/overloadCallTest.types          |   4 +-
 ...rorMatchesImplementationElaboaration.types |  12 +-
 .../overloadOnConstAsTypeAnnotation.types     |   4 +-
 .../overloadOnConstNoAnyImplementation.types  |  40 +-
 .../overloadOnConstNoAnyImplementation2.types |  44 +-
 ...verloadOnConstNoStringImplementation.types |  24 +-
 ...erloadOnConstNoStringImplementation2.types |  32 +-
 .../reference/overloadResolution.types        | 112 +--
 .../overloadResolutionClassConstructors.types | 132 +--
 .../overloadResolutionConstructors.types      | 112 +--
 .../overloadResolutionOverNonCTLambdas.types  |   4 +-
 ...overloadResolutionOverNonCTObjectLit.types |  24 +-
 .../reference/overloadResolutionTest1.types   |   8 +-
 .../reference/overloadResolutionWithAny.types |  20 +-
 tests/baselines/reference/overloadTag1.types  |  28 +-
 tests/baselines/reference/overloadTag2.types  |  16 +-
 ...lbacksWithDifferingOptionalityOnArgs.types |   8 +-
 .../reference/overloadingOnConstants1.types   |   8 +-
 .../reference/overloadingOnConstants2.types   |   8 +-
 .../overloadsAndTypeArgumentArity.types       |   8 +-
 .../overloadsAndTypeArgumentArityErrors.types |   8 +-
 .../overloadsWithComputedNames.types          |  12 +-
 .../reference/overloadsWithConstraints.types  |   4 +-
 .../overloadsWithProvisionalErrors.types      |   4 +-
 .../reference/override12(target=es2015).types |  12 +-
 .../reference/override12(target=esnext).types |  12 +-
 .../reference/override17(target=es2015).types |  12 +-
 .../reference/override17(target=esnext).types |  12 +-
 tests/baselines/reference/override4.types     |  16 +-
 tests/baselines/reference/override5.types     |  16 +-
 tests/baselines/reference/override6.types     |  12 +-
 tests/baselines/reference/override7.types     |  16 +-
 .../overrideBaseIntersectionMethod.types      |   8 +-
 ...paramTagBracketsAddOptionalUndefined.types |  12 +-
 .../reference/paramTagOnCallExpression.types  |   4 +-
 .../paramTagOnFunctionUsingArguments.types    |  12 +-
 .../reference/paramTagTypeResolution.types    |   4 +-
 .../reference/paramTagTypeResolution2.types   |   4 +-
 .../reference/paramTagWrapping.types          |  12 +-
 ...meterInitializersForwardReferencing1.types |  16 +-
 ...rInitializersForwardReferencing1_es6.types |  16 +-
 .../reference/parameterListAsTupleType.types  |   4 +-
 ...TypesWhenAppropriatelyContextualized.types |  16 +-
 .../parenthesizedContexualTyping1.types       |  32 +-
 .../parenthesizedContexualTyping3.types       |  28 +-
 ...sizedSatisfiesExpressionWithComments.types |  36 +-
 .../reference/parseAssertEntriesError.types   |   8 +-
 .../parseErrorDoubleCommaInCall.types         |   4 +-
 ...parseGenericArrowRatherThanLeftShift.types |   4 +-
 .../parseImportAttributesError.types          |   8 +-
 .../parseInvalidNonNullableTypes.types        |   8 +-
 .../reference/parseInvalidNullableTypes.types |   8 +-
 tests/baselines/reference/parser536727.types  |   4 +-
 .../reference/parserArgumentList1.types       |  16 +-
 .../baselines/reference/parserAstSpans1.types |  12 +-
 .../parserComputedPropertyName28.types        |   4 +-
 .../reference/parserES5ForOfStatement7.types  |   8 +-
 .../reference/parserES5SymbolProperty6.types  |   4 +-
 ...orRecovery_IncompleteMemberVariable1.types |  16 +-
 ...orRecovery_IncompleteMemberVariable2.types |  16 +-
 .../reference/parserForInStatement7.types     |   8 +-
 .../reference/parserForOfStatement7.types     |   8 +-
 tests/baselines/reference/parserModule1.types |   4 +-
 .../reference/parserModuleDeclaration11.types |   4 +-
 .../reference/parserObjectCreation1.types     |   4 +-
 .../reference/parserRealSource1.types         |   4 +-
 .../reference/parserRealSource10.types        | 418 ++++-----
 .../reference/parserRealSource11.types        |  72 +-
 .../reference/parserRealSource12.types        |   4 +-
 .../reference/parserRealSource14.types        |   8 +-
 .../reference/parserRealSource4.types         |   8 +-
 .../reference/parserRealSource5.types         |  16 +-
 .../reference/parserRealSource9.types         |   8 +-
 .../reference/parserS7.2_A1.5_T2.types        |   4 +-
 .../reference/parserSymbolProperty6.types     |   4 +-
 tests/baselines/reference/parserharness.types | 294 +++----
 .../baselines/reference/parserindenter.types  |  28 +-
 .../parsingDeepParenthensizedExpression.types |  28 +-
 ...artialOfLargeAPIIsAbleToBeWorkedWith.types |   8 +-
 .../reference/partiallyNamedTuples2.types     |   4 +-
 .../reference/plainJSGrammarErrors.types      |   4 +-
 .../plusOperatorWithNumberType.types          |  12 +-
 .../plusOperatorWithStringType.types          |  16 +-
 .../potentiallyUncalledDecorators.types       |   2 +-
 .../prettyFileWithErrorsAndTabs.types         |  12 +-
 .../reference/primitiveConstraints1.types     |  16 +-
 .../reference/primitiveConstraints2.types     |  16 +-
 .../reference/privateNameAccessors.types      |  12 +-
 .../privateNameAccessorsAccess.types          |   4 +-
 .../privateNameAccessorssDerivedClasses.types |   4 +-
 ...ComputedPropertyName1(target=es2015).types |  44 +-
 ...ComputedPropertyName1(target=es2022).types |  44 +-
 ...ComputedPropertyName1(target=esnext).types |  44 +-
 .../privateNameConstructorSignature.types     |   8 +-
 .../reference/privateNameDuplicateField.types |  16 +-
 .../reference/privateNameES5Ban.types         |   8 +-
 .../reference/privateNameEmitHelpers.types    |   8 +-
 .../privateNameFieldAssignment.types          |  16 +-
 .../privateNameFieldDerivedClasses.types      |   4 +-
 ...ldDestructuredBinding(target=es2015).types |  52 +-
 ...ldDestructuredBinding(target=es2022).types |  52 +-
 ...ldDestructuredBinding(target=esnext).types |  52 +-
 .../privateNameFieldUnaryMutation.types       |  68 +-
 ...ivateNameFieldsESNext(target=es2022).types |   8 +-
 ...ivateNameFieldsESNext(target=esnext).types |   8 +-
 .../privateNameInLhsReceiverExpression.types  |   8 +-
 .../reference/privateNameMethod.types         |  12 +-
 .../reference/privateNameMethodAsync.types    |   8 +-
 .../privateNameMethodCallExpression.types     |   8 +-
 .../privateNameMethodsDerivedClasses.types    |   4 +-
 ...ameNotAccessibleOutsideDefiningClass.types |   4 +-
 .../privateNameStaticAccessors.types          |  12 +-
 .../privateNameStaticAccessorsAccess.types    |   4 +-
 ...ateNameStaticAccessorsCallExpression.types |   8 +-
 ...teNameStaticAccessorssDerivedClasses.types |   4 +-
 .../privateNameStaticEmitHelpers.types        |   8 +-
 .../privateNameStaticFieldAssignment.types    |  16 +-
 ...rivateNameStaticFieldClassExpression.types |   8 +-
 ...privateNameStaticFieldDerivedClasses.types |  16 +-
 ...ldDestructuredBinding(target=es2015).types |  52 +-
 ...ldDestructuredBinding(target=es2022).types |  52 +-
 ...ldDestructuredBinding(target=esnext).types |  52 +-
 .../privateNameStaticFieldUnaryMutation.types |  36 +-
 .../reference/privateNameStaticMethod.types   |  12 +-
 .../privateNameStaticMethodAsync.types        |   8 +-
 ...rivateNameStaticMethodCallExpression.types |   8 +-
 ...aticsAndStaticMethods(target=es2022).types |  16 +-
 ...aticsAndStaticMethods(target=esnext).types |  16 +-
 .../reference/privateNameUnused.types         |   8 +-
 .../reference/privateNamesAndFields.types     |  16 +-
 .../privateNamesAndGenericClasses-2.types     |  16 +-
 .../privateNamesAndIndexedAccess.types        |   4 +-
 ...rivateNamesAndMethods(target=es2022).types |  16 +-
 ...rivateNamesAndMethods(target=esnext).types |  16 +-
 .../privateNamesAndStaticFields.types         |  16 +-
 ...NamesAndStaticMethods(target=es2022).types |  16 +-
 ...NamesAndStaticMethods(target=esnext).types |  16 +-
 .../reference/privateNamesAndkeyof.types      |   4 +-
 .../privateNamesIncompatibleModifiers.types   |  20 +-
 .../privateWriteOnlyAccessorRead.types        |  12 +-
 .../baselines/reference/promiseChaining.types |   4 +-
 tests/baselines/reference/promiseType.types   |  88 +-
 .../reference/promiseTypeInference.types      |   4 +-
 .../reference/promiseTypeInferenceUnion.types |  12 +-
 .../reference/promiseTypeStrictNull.types     |  88 +-
 .../reference/promiseVoidErrorCallback.types  |   4 +-
 .../propagationOfPromiseInitialization.types  |   6 +-
 tests/baselines/reference/properties.types    |   4 +-
 ...propertiesAndIndexersForNumericNames.types | 108 +--
 ...pertiesOfGenericConstructorFunctions.types |  20 +-
 .../baselines/reference/propertyAccess.types  |  12 +-
 .../baselines/reference/propertyAccess1.types |   8 +-
 ...opertyAccessOfReadonlyIndexSignature.types |   8 +-
 ...ccessOnTypeParameterWithConstraints2.types |   8 +-
 ...ccessOnTypeParameterWithConstraints3.types |   8 +-
 ...ccessOnTypeParameterWithConstraints5.types |   8 +-
 ...essOnTypeParameterWithoutConstraints.types |   4 +-
 .../reference/propertyAccessWidening.types    |  16 +-
 .../propertyAssignmentUseParentType3.types    |  12 +-
 ...protectedInstanceMemberAccessibility.types |   4 +-
 ...tterProtectedSetterFromThisParameter.types | 112 +--
 .../reference/quickInfoSatisfiesTag.baseline  |   6 +-
 .../reachabilityCheckWithEmptyDefault.types   |   4 +-
 .../reference/reachabilityChecks1.types       |   4 +-
 .../reference/reachabilityChecks5.types       |  56 +-
 .../reference/reachabilityChecks7.types       |   2 +-
 .../reactDefaultPropsInferenceSuccess.types   |   4 +-
 ...tTransitiveImportHasValidDeclaration.types |   4 +-
 .../reference/readonlyArraysAndTuples.types   |  24 +-
 .../reference/readonlyArraysAndTuples2.types  |   8 +-
 .../readonlyConstructorAssignment.types       |  32 +-
 .../readonlyInConstructorParameters.types     |   8 +-
 .../baselines/reference/readonlyMembers.types | 108 +--
 ...donlyPropertySubtypeRelationDirected.types |  32 +-
 .../reference/readonlyRestParameters.types    |  44 +-
 .../readonlyTupleAndArrayElaboration.types    |  32 +-
 .../reference/recursiveArrayNotCircular.types |   4 +-
 ...nstantiationsWithDefaultConstructors.types |   4 +-
 .../recursiveClassReferenceTest.types         |   4 +-
 .../reference/recursiveConditionalTypes.types |  12 +-
 .../reference/recursiveFieldSetting.types     |   4 +-
 .../reference/recursiveInference1.types       |   4 +-
 .../reference/recursiveTypeReferences1.types  |  60 +-
 .../reference/recursiveTypeRelations.types    |   4 +-
 .../referenceSatisfiesExpression.types        |  20 +-
 .../regExpWithSlashInCharClass.types          |  12 +-
 .../reference/regexMatchAll-esnext.types      |   4 +-
 tests/baselines/reference/regexMatchAll.types |   4 +-
 .../relativePathToDeclarationFile.types       |   4 +-
 ...ngDestructuredPropertyInFunctionType.types |  20 +-
 .../reference/requireEmitSemicolon.types      |   2 +-
 .../requiredInitializedParameter1.types       |  36 +-
 .../reference/resolveNameWithNamspace.types   |   4 +-
 .../reference/restArgAssignmentCompat.types   |   8 +-
 .../reference/restElementMustBeLast.types     |  12 +-
 .../restElementWithAssignmentPattern1.types   |  16 +-
 .../restElementWithAssignmentPattern2.types   |  16 +-
 .../restElementWithAssignmentPattern3.types   |  16 +-
 .../restElementWithAssignmentPattern4.types   |  16 +-
 .../restElementWithAssignmentPattern5.types   |   8 +-
 .../restParameterTypeInstantiation.types      |   8 +-
 .../restParameterWithBindingPattern3.types    |   4 +-
 .../reference/restTupleElements1.types        |  28 +-
 .../restTuplesFromContextualTypes.types       |  68 +-
 .../reference/returnInConstructor1.types      |  16 +-
 .../returnInfiniteIntersection.types          |   4 +-
 .../reference/returnStatements.types          |  16 +-
 .../returnTypeInferenceNotTooBroad.types      |   8 +-
 ...seInferenceInContextualInstantiation.types |   4 +-
 .../reverseMappedContravariantInference.types |   4 +-
 ...reverseMappedPartiallyInferableTypes.types |  20 +-
 .../reference/reverseMappedTupleContext.types |  32 +-
 ...erseMappedTypeIntersectionConstraint.types |   8 +-
 .../reverseMappedTypeLimitedConstraint.types  |   4 +-
 ...appedTypePrimitiveConstraintProperty.types |   8 +-
 .../reversedRecusiveTypeInstantiation.types   |   8 +-
 .../reference/scannerS7.2_A1.5_T2.types       |   4 +-
 tests/baselines/reference/scopeTests.types    |  16 +-
 tests/baselines/reference/setMethods.types    |  28 +-
 ...ndPropertyAssignmentsInDestructuring.types |  64 +-
 ...opertyAssignmentsInDestructuring_ES6.types |  64 +-
 ...naturesUseJSDocForOptionalParameters.types |   8 +-
 .../reference/silentNeverPropagation.types    |   4 +-
 .../simpleRecursionWithBaseCase1.types        |   4 +-
 .../baselines/reference/sliceResultCast.types |   4 +-
 ...irectedDeepObjectLiteralElaborations.types |   4 +-
 .../reference/sourceMap-Comments.types        |   4 +-
 .../sourceMap-FileWithComments.types          |  16 +-
 .../baselines/reference/sourceMapSample.types |  16 +-
 .../reference/sourceMapValidationClass.types  |   4 +-
 .../sourceMapValidationClasses.types          |  16 +-
 .../sourceMapValidationDecorators.types       |  40 +-
 ...nDestructuringForArrayBindingPattern.types |  36 +-
 ...DestructuringForArrayBindingPattern2.types | 400 ++++-----
 ...ForArrayBindingPatternDefaultValues2.types | 524 ++++++------
 ...DestructuringForObjectBindingPattern.types |  58 +-
 ...estructuringForObjectBindingPattern2.types | 386 ++++-----
 ...ForObjectBindingPatternDefaultValues.types | 178 ++--
 ...orObjectBindingPatternDefaultValues2.types | 626 +++++++-------
 ...estructuringForOfArrayBindingPattern.types |  48 +-
 ...structuringForOfArrayBindingPattern2.types |  48 +-
 ...orOfArrayBindingPatternDefaultValues.types |  96 +--
 ...rOfArrayBindingPatternDefaultValues2.types | 312 +++----
 ...structuringForOfObjectBindingPattern.types |  38 +-
 ...tructuringForOfObjectBindingPattern2.types |  38 +-
 ...rOfObjectBindingPatternDefaultValues.types | 130 +--
 ...OfObjectBindingPatternDefaultValues2.types | 370 ++++----
 ...gParameterNestedObjectBindingPattern.types |  46 +-
 ...tedObjectBindingPatternDefaultValues.types |  88 +-
 ...cturingParameterObjectBindingPattern.types |  32 +-
 ...terObjectBindingPatternDefaultValues.types |  48 +-
 ...cturingParametertArrayBindingPattern.types |  60 +-
 ...turingParametertArrayBindingPattern2.types |  60 +-
 ...tertArrayBindingPatternDefaultValues.types |  94 +-
 ...ertArrayBindingPatternDefaultValues2.types |  92 +-
 ...dationDestructuringVariableStatement.types |  16 +-
 ...ationDestructuringVariableStatement1.types |  16 +-
 ...VariableStatementArrayBindingPattern.types |  24 +-
 ...ariableStatementArrayBindingPattern2.types |  24 +-
 ...ariableStatementArrayBindingPattern3.types | 120 +--
 ...entArrayBindingPatternDefaultValues3.types | 272 +++---
 ...eStatementNestedObjectBindingPattern.types |  22 +-
 ...bjectBindingPatternWithDefaultValues.types |  90 +-
 .../reference/sourceMapValidationFor.types    |  44 +-
 ...urceMapValidationFunctionExpressions.types |   4 +-
 .../sourceMapValidationStatements.types       |  44 +-
 .../specialIntersectionsInMappedTypes.types   |  16 +-
 .../reference/specializeVarArgs1.types        |   4 +-
 ...ializedSignatureAsCallbackParameter1.types |  16 +-
 tests/baselines/reference/spliceTuples.types  |  24 +-
 tests/baselines/reference/spreadMethods.types |   4 +-
 .../reference/spreadNonPrimitive.types        |   8 +-
 ...IndexDoesNotAddUndefinedToLocalIndex.types |   4 +-
 .../reference/spreadTypeRemovesReadonly.types |  12 +-
 tests/baselines/reference/spreadUnion3.types  |   4 +-
 .../spreadsAndContextualTupleTypes.types      |  32 +-
 ...ymousTypeNotReferencingTypeParameter.types |  72 +-
 .../reference/staticGetterAndSetter.types     |   4 +-
 .../reference/staticIndexSignature1.types     |  16 +-
 .../reference/staticIndexSignature2.types     |  16 +-
 .../reference/staticIndexSignature6.types     |  12 +-
 .../reference/staticInstanceResolution3.types |   4 +-
 ...rAssignsToConstructorFunctionMembers.types |   8 +-
 .../baselines/reference/staticPropSuper.types |  16 +-
 .../staticPropertyNotInClassType.types        |  16 +-
 .../reference/staticVisibility.types          |   8 +-
 tests/baselines/reference/statics.types       |  28 +-
 .../reference/strictBindCallApply1.types      | 260 +++---
 .../reference/strictBindCallApply2.types      |   2 +-
 .../reference/strictModeInConstructor.types   |  24 +-
 .../reference/strictNullLogicalAndOr.types    |   4 +-
 .../reference/strictOptionalProperties1.types | 116 +--
 .../strictPropertyInitialization.types        | 112 +--
 .../reference/strictSubtypeAndNarrowing.types |  20 +-
 .../strictTypeofUnionNarrowing.types          |  16 +-
 .../reference/stringEnumLiteralTypes1.types   |   4 +-
 .../reference/stringEnumLiteralTypes2.types   |   4 +-
 .../baselines/reference/stringIncludes.types  |  12 +-
 ...rConstrainsPropertyDeclarations.errors.txt |   6 +-
 ...ndexerConstrainsPropertyDeclarations.types |  32 +-
 ...dexerConstrainsPropertyDeclarations2.types |   8 +-
 .../reference/stringIndexingResults.types     |   4 +-
 ...ralPropertyNameWithLineContinuation1.types |   8 +-
 .../stringLiteralTypesAsTags01.types          |   4 +-
 .../stringLiteralTypesAsTags02.types          |   4 +-
 .../stringLiteralTypesAsTags03.types          |   4 +-
 ...gLiteralTypesOverloadAssignability01.types |   8 +-
 ...gLiteralTypesOverloadAssignability02.types |   8 +-
 ...gLiteralTypesOverloadAssignability03.types |   8 +-
 ...gLiteralTypesOverloadAssignability04.types |   8 +-
 ...gLiteralTypesOverloadAssignability05.types |   8 +-
 ...alsAssertionsInEqualityComparisons01.types |   8 +-
 ...alsAssertionsInEqualityComparisons02.types |   4 +-
 .../reference/stringPropertyAccess.types      |   8 +-
 .../stringPropertyAccessWithError.types       |   4 +-
 tests/baselines/reference/stringRawType.types |  12 +-
 ...ty(exactoptionalpropertytypes=false).types |   8 +-
 ...ity(exactoptionalpropertytypes=true).types |   8 +-
 tests/baselines/reference/structural1.types   |   8 +-
 .../reference/subtypeRelationForNever.types   |  16 +-
 .../reference/subtypingTransitivity.types     |   8 +-
 .../subtypingWithCallSignaturesA.types        |   4 +-
 tests/baselines/reference/superAccess.types   |   6 +-
 .../reference/superCallArgsMustMatch.types    |   4 +-
 .../superCallInNonStaticMethod.types          |   4 +-
 .../reference/superCallInStaticMethod.types   |   4 +-
 tests/baselines/reference/superCalls.types    |   8 +-
 .../reference/superElementAccess.types        |  28 +-
 tests/baselines/reference/superErrors.types   |   8 +-
 .../reference/superInConstructorParam1.types  |   4 +-
 .../baselines/reference/superInLambdas.types  |  18 +-
 .../reference/superPropertyAccess.types       |  28 +-
 .../superPropertyAccessInSuperCall01.types    |   4 +-
 .../reference/superPropertyAccess_ES5.types   |   8 +-
 .../reference/superPropertyAccess_ES6.types   |   8 +-
 ...PropertyInConstructorBeforeSuperCall.types |   4 +-
 .../reference/superSymbolIndexedAccess1.types |   4 +-
 .../reference/superSymbolIndexedAccess3.types |   4 +-
 .../reference/superSymbolIndexedAccess4.types |   4 +-
 ...e-object-literal-getters-and-setters.types |   4 +-
 .../reference/switchStatements.types          |  20 +-
 .../reference/symbolProperty21.types          |   4 +-
 .../reference/symbolProperty22.types          |   4 +-
 .../reference/symbolProperty40.types          |   8 +-
 .../reference/symbolProperty41.types          |   4 +-
 .../reference/symbolProperty46.types          |  16 +-
 .../reference/symbolProperty47.types          |  20 +-
 .../reference/symbolProperty61.types          |   4 +-
 tests/baselines/reference/symbolType10.types  |   4 +-
 tests/baselines/reference/symbolType11.types  |   4 +-
 tests/baselines/reference/symbolType12.types  |   4 +-
 tests/baselines/reference/symbolType4.types   |   4 +-
 tests/baselines/reference/symbolType5.types   |   4 +-
 tests/baselines/reference/symbolType6.types   |   4 +-
 tests/baselines/reference/symbolType7.types   |   4 +-
 tests/baselines/reference/symbolType8.types   |   4 +-
 tests/baselines/reference/symbolType9.types   |   4 +-
 tests/baselines/reference/syntaxErrors.types  |   4 +-
 ...eticDefaultExportsWithDynamicImports.types |   8 +-
 .../systemDefaultImportCallable.types         |   4 +-
 .../reference/taggedPrimitiveNarrowing.types  |   8 +-
 .../taggedTemplateContextualTyping2.types     |  12 +-
 ...TemplateStringsTypeArgumentInference.types |  56 +-
 ...plateStringsTypeArgumentInferenceES6.types |  56 +-
 ...lateStringsWithIncompatibleTypedTags.types |   4 +-
 ...eStringsWithIncompatibleTypedTagsES6.types |   4 +-
 ...ingsWithManyCallAndMemberExpressions.types |  12 +-
 ...sWithManyCallAndMemberExpressionsES6.types |  12 +-
 ...mplateStringsWithOverloadResolution1.types |  64 +-
 ...teStringsWithOverloadResolution1_ES6.types |  64 +-
 ...mplateStringsWithOverloadResolution2.types |  16 +-
 ...teStringsWithOverloadResolution2_ES6.types |  16 +-
 ...mplateStringsWithOverloadResolution3.types |  68 +-
 ...teStringsWithOverloadResolution3_ES6.types |  68 +-
 ...nExpressionsInSubstitutionExpression.types |   8 +-
 ...pressionsInSubstitutionExpressionES6.types |   8 +-
 .../taggedTemplateStringsWithTypedTags.types  |  52 +-
 ...aggedTemplateStringsWithTypedTagsES6.types |  52 +-
 ...esWithIncompleteTemplateExpressions3.types |   4 +-
 ...esWithIncompleteTemplateExpressions4.types |   4 +-
 ...esWithIncompleteTemplateExpressions5.types |   8 +-
 ...esWithIncompleteTemplateExpressions6.types |   4 +-
 .../taggedTemplatesWithTypeArguments2.types   |  64 +-
 .../baselines/reference/targetTypeArgs.types  |   4 +-
 .../reference/targetTypeBaseCalls.types       |  24 +-
 .../baselines/reference/targetTypeCalls.types |   4 +-
 .../reference/targetTypeCastTest.types        |   4 +-
 .../reference/targetTypeObjectLiteral.types   |   8 +-
 .../baselines/reference/targetTypeTest1.types |  36 +-
 .../baselines/reference/targetTypeTest3.types |  12 +-
 ...ningOfConstantBindingWithInitializer.types |   8 +-
 .../templateLiteralIntersection4.types        |   6 +-
 .../reference/templateLiteralTypes2.types     |   8 +-
 .../reference/templateLiteralTypes3.types     |  20 +-
 .../reference/templateLiteralTypes4.types     |  12 +-
 .../reference/templateLiteralsInTypes.types   |   4 +-
 .../templateStringWithPropertyAccess.types    |   4 +-
 .../templateStringWithPropertyAccessES6.types |   4 +-
 ...lateStringsArrayTypeDefinedInES5Mode.types |  16 +-
 ...ateStringsArrayTypeNotDefinedES5Mode.types |  16 +-
 ...teStringsArrayTypeRedefinedInES6Mode.types |  16 +-
 ...nExpressionsInSubstitutionExpression.types |   8 +-
 ...pressionsInSubstitutionExpressionES6.types |   8 +-
 tests/baselines/reference/thisBinding2.types  |   4 +-
 tests/baselines/reference/thisCapture1.types  |   8 +-
 .../reference/thisInFunctionCall.types        |  12 +-
 .../reference/thisInFunctionCallJs.types      |  12 +-
 .../thisInGenericStaticMembers.types          |   8 +-
 .../reference/thisInSuperCall2.types          |   4 +-
 .../reference/thisInSuperCall3.types          |   4 +-
 .../thisPropertyAssignmentInherited.types     |   4 +-
 tests/baselines/reference/thisTag1.types      |   4 +-
 .../reference/thisTypeAccessibility.types     |  24 +-
 .../baselines/reference/thisTypeErrors2.types |   8 +-
 .../thisTypeInAccessorsNegative.types         |   4 +-
 .../reference/thisTypeInFunctions.types       | 100 +--
 .../reference/thisTypeInFunctions2.types      |   4 +-
 .../thisTypeInFunctionsNegative.types         |  76 +-
 .../reference/thisTypeInObjectLiterals2.types |  88 +-
 .../reference/thisTypeInTuples.types          |  20 +-
 .../thisTypeOfConstructorFunctions.types      |   8 +-
 .../reference/thisTypeSyntacticContext.types  |   4 +-
 .../baselines/reference/throwStatements.types |  12 +-
 tests/baselines/reference/topLevel.types      |  16 +-
 ...Await.1(module=es2022,target=es2015).types |   4 +-
 ...Await.1(module=es2022,target=es2017).types |   4 +-
 ...Await.1(module=esnext,target=es2015).types |   4 +-
 ...Await.1(module=esnext,target=es2017).types |   4 +-
 ...Await.1(module=system,target=es2015).types |   4 +-
 ...Await.1(module=system,target=es2017).types |   4 +-
 ...lingCommaInHeterogenousArrayLiteral1.types |  32 +-
 ...eWithMissingExports(module=commonjs).types |   4 +-
 ...nceWithMissingExports(module=node16).types |   4 +-
 ...eWithMissingExports(module=nodenext).types |   4 +-
 .../tryCatchFinallyControlFlow.types          |  20 +-
 .../baselines/reference/ts-expect-error.types |  26 +-
 tests/baselines/reference/ts-ignore.types     |  16 +-
 .../reference/tsNoCheckForTypescript.types    |   4 +-
 .../tsNoCheckForTypescriptComments1.types     |   4 +-
 .../tsNoCheckForTypescriptComments2.types     |   4 +-
 .../reference/tsxAttributeErrors.types        |   8 +-
 .../reference/tsxAttributeResolution1.types   |  14 +-
 .../reference/tsxAttributeResolution14.types  |  16 +-
 .../reference/tsxAttributeResolution3.types   |   4 +-
 .../reference/tsxAttributeResolution7.types   |   8 +-
 .../reference/tsxAttributeResolution9.types   |   4 +-
 .../tsxDeepAttributeAssignabilityError.types  |   4 +-
 .../reference/tsxDynamicTagName5.types        |   4 +-
 .../reference/tsxDynamicTagName7.types        |   4 +-
 .../reference/tsxDynamicTagName8.types        |   4 +-
 .../reference/tsxElementResolution11.types    |   4 +-
 .../reference/tsxElementResolution12.types    |   8 +-
 .../reference/tsxElementResolution8.types     |   4 +-
 .../reference/tsxFragmentChildrenCheck.types  |   8 +-
 .../reference/tsxGenericAttributesType1.types |   8 +-
 ...sxInferenceShouldNotYieldAnyOnUnions.types |  24 +-
 .../tsxLibraryManagedAttributes.types         |  56 +-
 ...ctComponentWithDefaultTypeParameter1.types |   4 +-
 ...ctComponentWithDefaultTypeParameter3.types |   4 +-
 .../tsxReactEmit8(jsx=react-jsx).types        |   4 +-
 .../tsxReactEmit8(jsx=react-jsxdev).types     |   4 +-
 ...ctEmitSpreadAttribute(target=es2015).types |  48 +-
 ...ctEmitSpreadAttribute(target=es2018).types |  48 +-
 ...ctEmitSpreadAttribute(target=esnext).types |  48 +-
 .../tsxSpreadAttributesResolution11.types     |  12 +-
 .../tsxSpreadAttributesResolution12.types     |   4 +-
 .../tsxSpreadAttributesResolution2.types      |  12 +-
 .../tsxSpreadAttributesResolution3.types      |   4 +-
 .../tsxSpreadAttributesResolution4.types      |   4 +-
 ...xStatelessFunctionComponentOverload1.types |  20 +-
 ...xStatelessFunctionComponentOverload2.types |  14 +-
 ...xStatelessFunctionComponentOverload3.types |   8 +-
 ...xStatelessFunctionComponentOverload4.types |  16 +-
 ...xStatelessFunctionComponentOverload5.types |   4 +-
 ...xStatelessFunctionComponentOverload6.types |   4 +-
 ...onComponentWithDefaultTypeParameter2.types |   4 +-
 .../tsxStatelessFunctionComponents1.types     |   4 +-
 .../tsxStatelessFunctionComponents2.types     |   8 +-
 ...FunctionComponentsWithTypeArguments1.types |  16 +-
 ...FunctionComponentsWithTypeArguments2.types |  20 +-
 ...FunctionComponentsWithTypeArguments5.types |   4 +-
 ...ArgumentPartialDefinitionStillErrors.types |   4 +-
 .../reference/tsxTypeArgumentResolution.types |  48 +-
 .../baselines/reference/tsxUnionSpread.types  |   8 +-
 .../reference/tupleTypeInference2.types       |   8 +-
 tests/baselines/reference/tupleTypes.types    |  56 +-
 .../twiceNestedKeyofIndexInference.types      |  12 +-
 ...rgedInterfacesWithDifferingOverloads.types |   8 +-
 ...gedInterfacesWithDifferingOverloads2.types |  16 +-
 tests/baselines/reference/typeAliases.types   |   4 +-
 ...notationBestCommonTypeInArrayLiteral.types |  32 +-
 .../reference/typeArgInference2.types         |  28 +-
 .../reference/typeArgInferenceWithNull.types  |   4 +-
 .../reference/typeArgumentInference.types     |  96 +--
 ...ArgumentInferenceConstructSignatures.types | 112 +--
 .../typeArgumentInferenceErrors.types         |  16 +-
 ...rgumentInferenceWithClassExpression1.types |   4 +-
 ...typeArgumentInferenceWithConstraints.types | 116 +--
 ...peArgumentInferenceWithObjectLiteral.types |  12 +-
 ...ntsShouldDisallowNonGenericOverloads.types |  16 +-
 .../typeAssertionToGenericFunctionType.types  |   4 +-
 .../reference/typeCheckExportsVariable.types  |   8 +-
 ...ckingInsideFunctionExpressionInArray.types |   4 +-
 .../typeFromJSInitializer.errors.txt          |   8 +-
 .../reference/typeFromJSInitializer.types     |  32 +-
 .../reference/typeFromJSInitializer4.types    |  16 +-
 .../typeFromParamTagForFunction.types         |  20 +-
 .../typeFromPropertyAssignment10.types        |  12 +-
 .../typeFromPropertyAssignment10_1.types      |  12 +-
 .../typeFromPropertyAssignment29.types        |  36 +-
 .../typeFromPropertyAssignment30.types        |   4 +-
 .../typeFromPropertyAssignment31.types        |   8 +-
 .../typeFromPropertyAssignment32.types        |   8 +-
 .../typeFromPropertyAssignment33.types        |   8 +-
 .../typeFromPropertyAssignment4.types         |   8 +-
 .../typeFromPrototypeAssignment3.types        |   4 +-
 .../typeFromPrototypeAssignment4.types        |   4 +-
 .../reference/typeGuardFunctionGenerics.types |   4 +-
 .../typeGuardIntersectionTypes.types          |  16 +-
 ...NarrowsIndexedAccessOfKnownProperty1.types |   2 +-
 ...NarrowsIndexedAccessOfKnownProperty3.types |  12 +-
 ...NarrowsIndexedAccessOfKnownProperty4.types |   8 +-
 ...NarrowsIndexedAccessOfKnownProperty7.types |   8 +-
 ...NarrowsIndexedAccessOfKnownProperty8.types |   8 +-
 .../reference/typeGuardNesting.types          |  16 +-
 .../typeGuardOfFormFunctionEquality.types     |  12 +-
 .../reference/typeGuardOfFormThisMember.types |   8 +-
 .../typeGuardOfFormThisMemberErrors.types     |   8 +-
 .../typeGuardOfFormTypeOfOther.types          |   4 +-
 .../typeGuardOfFromPropNameInUnionType.types  |  24 +-
 .../reference/typeGuardsAsAssertions.types    |  20 +-
 .../reference/typeGuardsDefeat.types          |  24 +-
 .../typeGuardsInConditionalExpression.types   |  72 +-
 .../reference/typeGuardsInDoStatement.types   |   8 +-
 .../reference/typeGuardsInIfStatement.types   |  48 +-
 ...GuardsInRightOperandOfAndAndOperator.types |  24 +-
 ...peGuardsInRightOperandOfOrOrOperator.types |  24 +-
 .../typeGuardsNestedAssignments.types         |   4 +-
 .../reference/typeGuardsOnClassProperty.types |  12 +-
 ...WithInstanceOfByConstructorSignature.types |  16 +-
 ...rdsWithInstanceOfBySymbolHasInstance.types |  16 +-
 .../typeInferenceCacheInvalidation.types      |  16 +-
 .../typeInferenceFBoundedTypeParams.types     |  20 +-
 .../reference/typeInferenceFixEarly.types     |   4 +-
 .../reference/typeInferenceLiteralUnion.types |   4 +-
 .../typeInferenceWithExcessProperties.types   |  20 +-
 .../typeInferenceWithTupleType.types          |  24 +-
 tests/baselines/reference/typeMatch2.types    |  36 +-
 .../reference/typeOfThisGeneral.types         |  16 +-
 .../reference/typeOfThisInStaticMembers.types |   8 +-
 ...fThisInStaticMembers5(target=es2022).types |   4 +-
 ...peOfThisInStaticMembers5(target=es5).types |   4 +-
 ...peOfThisInStaticMembers5(target=es6).types |   4 +-
 ...fThisInStaticMembers5(target=esnext).types |   4 +-
 ...YieldWithUnionInContextualReturnType.types |  16 +-
 .../typeParameterAndArgumentOfSameName1.types |   4 +-
 ...peParameterAsTypeParameterConstraint.types |  48 +-
 ...eParameterAsTypeParameterConstraint2.types |  28 +-
 ...sTypeParameterConstraintTransitively.types |  48 +-
 ...TypeParameterConstraintTransitively2.types |  36 +-
 .../typeParameterConstModifiers.types         |  16 +-
 .../reference/typeParameterLeak.types         |   8 +-
 ...rametersAndParametersInComputedNames.types |   4 +-
 .../typePredicateWithThisParameter.types      |  16 +-
 .../typePredicatesOptionalChaining2.types     |   8 +-
 .../reference/typeQueryOnClass.types          |   4 +-
 .../reference/typeSatisfaction.types          |  24 +-
 .../typeSatisfactionWithDefaultExport.types   |   4 +-
 .../typeSatisfaction_asConstArrays.types      |  56 +-
 .../typeSatisfaction_contextualTyping3.types  |   8 +-
 ...ypeSatisfaction_errorLocations1.errors.txt |   4 +-
 .../typeSatisfaction_errorLocations1.types    |  68 +-
 ...tisfaction_optionalMemberConformance.types |   4 +-
 ...ypeSatisfaction_propNameConstraining.types |  12 +-
 ...Satisfaction_propertyNameFulfillment.types |  12 +-
 ...tisfaction_propertyValueConformance3.types |  32 +-
 .../reference/typeTagModuleExports.types      |   4 +-
 .../reference/typeTagNoErasure.types          |   4 +-
 .../typeTagPrototypeAssignment.types          |   8 +-
 tests/baselines/reference/typeVal.types       |  12 +-
 .../baselines/reference/typedArrays-es5.types |  36 +-
 .../baselines/reference/typedArrays-es6.types |  36 +-
 tests/baselines/reference/typedArrays.types   | 144 ++--
 .../typedArraysCrossAssignability01.types     |  36 +-
 .../reference/typedArraysSubarray.types       | 144 ++--
 .../typedefOnSemicolonClassElement.types      |   4 +-
 .../reference/typedefOnStatements.types       |   8 +-
 tests/baselines/reference/typedefScope1.types |   8 +-
 .../typedefTagExtraneousProperty.types        |  20 +-
 .../reference/typedefTagNested.types          |  18 +-
 .../baselines/reference/typeofInterface.types |   4 +-
 .../reference/typeofObjectInference.types     |  16 +-
 .../typeofOperatorWithNumberType.types        |  12 +-
 .../typeofOperatorWithStringType.types        |  16 +-
 tests/baselines/reference/typeofThis.types    |  24 +-
 .../typeofThisInMethodSignature.types         |   4 +-
 .../types.asyncGenerators.es2018.1.types      | 160 ++--
 .../types.asyncGenerators.es2018.2.types      | 112 +--
 .../typesWithSpecializedCallSignatures.types  |   4 +-
 ...esWithSpecializedConstructSignatures.types |   8 +-
 .../reference/umd-augmentation-1.types        |  16 +-
 .../reference/umd-augmentation-2.types        |  16 +-
 .../reference/umd-augmentation-3.types        |  16 +-
 .../reference/umd-augmentation-4.types        |  16 +-
 ...uncalledFunctionChecksInConditional2.types |  24 +-
 .../reference/underscoreMapFirst.types        |   4 +-
 .../baselines/reference/underscoreTest1.types | 808 +++++++++---------
 .../reference/unicodeEscapesInJsxtags.types   |   8 +-
 ...icodeEscapesInNames01(target=es2015).types | 128 +--
 .../unicodeEscapesInNames01(target=es5).types | 128 +--
 ...icodeEscapesInNames01(target=esnext).types | 128 +--
 ...icodeEscapesInNames02(target=es2015).types |  24 +-
 .../unionAndIntersectionInference1.types      |   8 +-
 .../unionAndIntersectionInference3.types      |  12 +-
 .../unionReductionMutualSubtypes.types        |   4 +-
 ...ingAndIdenticalBaseTypeExistsNoCrash.types |   4 +-
 .../reference/unionThisTypeInFunctions.types  |   4 +-
 .../reference/unionTypeCallSignatures.types   | 208 ++---
 .../reference/unionTypeCallSignatures2.types  |  24 +-
 .../reference/unionTypeCallSignatures3.types  |   4 +-
 .../reference/unionTypeCallSignatures4.types  |  92 +-
 .../reference/unionTypeCallSignatures5.types  |   4 +-
 .../reference/unionTypeCallSignatures7.types  |   4 +-
 .../unionTypeConstructSignatures.types        | 196 ++---
 .../reference/unionTypeFromArrayLiteral.types |  24 +-
 .../reference/unionTypeInference.types        |  24 +-
 .../reference/unionTypeReduction2.types       |  24 +-
 .../unionTypeWithIndexSignature.types         |  40 +-
 .../reference/unionsOfTupleTypes1.types       |  36 +-
 ...llowsIndexInObjectWithIndexSignature.types |   4 +-
 ...ssignmentOnGlobalAugmentationSuceeds.types |  12 +-
 .../uniqueSymbolsPropertyNames.types          |  12 +-
 .../reference/unknownControlFlow.types        |  20 +-
 ...ownLikeUnionObjectFlagsNotPropagated.types |   8 +-
 tests/baselines/reference/unknownType1.types  |  32 +-
 tests/baselines/reference/unknownType2.types  |  12 +-
 .../unreachableSwitchTypeofAny.types          |  32 +-
 .../unreachableSwitchTypeofUnknown.types      |  32 +-
 .../reference/unspecializedConstraints.types  |   8 +-
 ...ypedFunctionCallsWithTypeParameters1.types |   8 +-
 .../unusedIdentifiersConsolidated1.types      |   8 +-
 .../reference/unusedImportDeclaration.types   |   4 +-
 ...eclarationWithinFunctionDeclaration1.types |   8 +-
 ...DeclarationWithinFunctionExpression1.types |   8 +-
 ...ExpressionWithinFunctionDeclaration1.types |   8 +-
 ...nExpressionWithinFunctionExpression1.types |   8 +-
 ...unusedMultipleParameter1InContructor.types |   8 +-
 ...ltipleParameter1InFunctionExpression.types |   8 +-
 ...unusedMultipleParameter2InContructor.types |   8 +-
 ...ltipleParameter2InFunctionExpression.types |   8 +-
 ...ipleParameters1InFunctionDeclaration.types |   8 +-
 ...ltipleParameters1InMethodDeclaration.types |   8 +-
 ...ipleParameters2InFunctionDeclaration.types |   8 +-
 ...ltipleParameters2InMethodDeclaration.types |   8 +-
 .../unusedPrivateStaticMembers.types          |   8 +-
 .../reference/unusedSetterInClass2.types      |   8 +-
 ...iablesWithUnderscoreInBindingElement.types |   2 +-
 .../reference/useBeforeDeclaration.types      |   4 +-
 .../baselines/reference/useRegexpGroups.types |   4 +-
 .../reference/useSharedArrayBuffer1.types     |  12 +-
 .../reference/useSharedArrayBuffer4.types     |  12 +-
 .../reference/useSharedArrayBuffer5.types     |   4 +-
 .../reference/useSharedArrayBuffer6.types     |   4 +-
 ...oduleWithExportImportInValuePosition.types |   8 +-
 .../validMultipleVariableDeclarations.types   |  16 +-
 tests/baselines/reference/varBlock.types      |   4 +-
 .../reference/varRequireFromJavascript.types  |   4 +-
 .../reference/varRequireFromTypescript.types  |   4 +-
 tests/baselines/reference/vararg.types        |  72 +-
 tests/baselines/reference/vardecl.types       |  24 +-
 ...aratorResolvedDuringContextualTyping.types |   4 +-
 .../baselines/reference/variadicTuples1.types | 412 ++++-----
 .../reference/variadicTuples2.errors.txt      |  24 +-
 .../baselines/reference/variadicTuples2.types | 368 ++++----
 .../reference/varianceAnnotations.types       |   8 +-
 .../verbatimModuleSyntaxRestrictionsCJS.types |   4 +-
 .../voidAsNonAmbiguousReturnType.types        |   2 +-
 .../voidFunctionAssignmentCompat.types        |   4 +-
 .../voidOperatorWithNumberType.types          |  12 +-
 .../voidOperatorWithStringType.types          |  16 +-
 .../vueLikeDataAndPropsInference.types        |   4 +-
 .../vueLikeDataAndPropsInference2.types       |   4 +-
 tests/baselines/reference/widenToAny1.types   |   4 +-
 tests/baselines/reference/widenToAny2.types   |   4 +-
 tests/baselines/reference/widenedTypes.types  |  24 +-
 .../wideningWithTopLevelTypeParameter.types   |  28 +-
 .../baselines/reference/withExportDecl.types  |  16 +-
 .../baselines/reference/withImportDecl.types  |   8 +-
 tests/baselines/reference/witness.types       |   4 +-
 .../wrappedAndRecursiveConstraints2.types     |   8 +-
 .../wrappedAndRecursiveConstraints3.types     |   8 +-
 .../wrappedAndRecursiveConstraints4.types     |  12 +-
 .../wrappedRecursiveGenericType.types         |  16 +-
 .../reference/yieldExpression1.types          |   4 +-
 2294 files changed, 23070 insertions(+), 23068 deletions(-)

diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
index 11bbc892e5f..9dfdfee91e6 100644
--- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
@@ -83,8 +83,8 @@ var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >  : ^^^^^^^^
 >Point : typeof A.Point
 >      : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
  
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
index 949ff68e2e1..280e9ba03bb 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
@@ -75,8 +75,8 @@ var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >  : ^^^^^^^^
 >Point : typeof A.Point
 >      : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types
index 500210e7768..dab3a189612 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types
@@ -44,8 +44,8 @@ module clodule {
 >        : ^^^^^^^^^^^^^^
 >sfn : (id: string) => number
 >    : ^  ^^      ^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types
index 6c807c258da..38c458d09c7 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types
@@ -18,12 +18,12 @@ class Point {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 module Point {
@@ -57,12 +57,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     export module Point {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
index 76356f15ff5..8d0b68c7ae1 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
@@ -18,12 +18,12 @@ class Point {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 module Point {
@@ -59,12 +59,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     export module Point {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types
index 544d5beee87..fef199544f2 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types
@@ -18,12 +18,12 @@ class Point {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 module Point {
@@ -59,12 +59,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     export module Point {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
index 598ea3714d9..a3fab777b3e 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
@@ -18,12 +18,12 @@ class Point {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 module Point {
@@ -59,12 +59,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     export module Point {
diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types
index 54876a145bf..d043af729d2 100644
--- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types
@@ -69,10 +69,10 @@ module X.Y {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
     }
 }
 
@@ -93,10 +93,10 @@ var cl = new X.Y.Point(1,1);
 >  : ^^^^^^^^^^
 >Point : typeof X.Y.Point
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
 var cl = X.Y.Point.Origin; // error not expected here same as bug 83996 ?
 >cl : X.Y.Point
diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types
index e96c70c3a58..948e8c440a4 100644
--- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types
+++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types
@@ -69,10 +69,10 @@ module X.Y {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
     }
 }
 
@@ -93,10 +93,10 @@ var cl = new X.Y.Point(1,1);
 >  : ^^^^^^^^^^
 >Point : typeof X.Y.Point
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
 var cl = X.Y.Point.Origin; // error not expected here same as bug 83996 ?
 >cl : X.Y.Point
diff --git a/tests/baselines/reference/ES5For-of30.types b/tests/baselines/reference/ES5For-of30.types
index 2a2fd24aa7f..2cbbb805b61 100644
--- a/tests/baselines/reference/ES5For-of30.types
+++ b/tests/baselines/reference/ES5For-of30.types
@@ -12,26 +12,26 @@ var tuple: [number, string] = [2, "3"];
 >      : ^^^^^^^^^^^^^^^^
 >[2, "3"] : [number, string]
 >         : ^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"3" : string
->    : ^^^^^^
+>2 : 2
+>  : ^
+>"3" : "3"
+>    : ^^^
 
 for ([a = 1, b = ""] of tuple) {
 >[a = 1, b = ""] : [number, string]
 >                : ^^^^^^^^^^^^^^^^
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
->b = "" : string
->       : ^^^^^^
+>1 : 1
+>  : ^
+>b = "" : ""
+>       : ^^
 >b : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >tuple : [number, string]
 >      : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5For-of31.types b/tests/baselines/reference/ES5For-of31.types
index a117eb394ea..7dc4c17850c 100644
--- a/tests/baselines/reference/ES5For-of31.types
+++ b/tests/baselines/reference/ES5For-of31.types
@@ -12,20 +12,20 @@ for ({ a: b = 1, b: a = ""} of []) {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->b = 1 : number
->      : ^^^^^^
+>b = 1 : 1
+>      : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->a = "" : string
->       : ^^^^^^
+>a = "" : ""
+>       : ^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5For-of37.types b/tests/baselines/reference/ES5For-of37.types
index 494da43ed8a..58c2d9689f3 100644
--- a/tests/baselines/reference/ES5For-of37.types
+++ b/tests/baselines/reference/ES5For-of37.types
@@ -46,8 +46,8 @@ for (const i of [0, 1, 2, 3, 4]) {
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'ERR' : string
->      : ^^^^^^
+>'ERR' : "ERR"
+>      : ^^^^^
             }
         }
         console.log(i);
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck13.types b/tests/baselines/reference/ES5For-ofTypeCheck13.types
index a910c2472df..57b4befbd99 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck13.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck13.types
@@ -18,8 +18,8 @@ strSet.add('Hello')
 >       : ^^^^^^^^^^^
 >add : (value: string) => Set<string>
 >    : ^     ^^^^^^^^^^^^^^^^^^^^^^^^
->'Hello' : string
->        : ^^^^^^
+>'Hello' : "Hello"
+>        : ^^^^^^^
 
 strSet.add('World')
 >strSet.add('World') : Set<string>
@@ -30,8 +30,8 @@ strSet.add('World')
 >       : ^^^^^^^^^^^
 >add : (value: string) => Set<string>
 >    : ^     ^^^^^^^^^^^^^^^^^^^^^^^^
->'World' : string
->        : ^^^^^^
+>'World' : "World"
+>        : ^^^^^^^
 
 for (const str of strSet) { }
 >str : any
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck3.types b/tests/baselines/reference/ES5For-ofTypeCheck3.types
index f0ef33b614d..be27f742e17 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck3.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck3.types
@@ -6,10 +6,10 @@ var tuple: [string, number] = ["", 0];
 >      : ^^^^^^^^^^^^^^^^
 >["", 0] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 for (var v of tuple) { }
 >v : string | number
diff --git a/tests/baselines/reference/ES5for-of32.types b/tests/baselines/reference/ES5for-of32.types
index b7ced024728..73590e0d84a 100644
--- a/tests/baselines/reference/ES5for-of32.types
+++ b/tests/baselines/reference/ES5for-of32.types
@@ -40,12 +40,12 @@ for (let num of array) {
 >      : ^^^^^^^^
 >[4,5,6] : number[]
 >        : ^^^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
     }
     
     sum += num;
diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
index 7107ca119ec..6eb5814cd7d 100644
--- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
@@ -61,8 +61,8 @@ var y = new enumdule.Point(0, 0);
 >         : ^^^^^^^^^^^^^^^
 >Point : typeof enumdule.Point
 >      : ^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index 4a9c8e2c9fd..51fb4a932f2 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -25,12 +25,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export class Point3d extends Point {
 >Point3d : Point3d
@@ -50,16 +50,16 @@ module A {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export class Line<TPoint extends Point>{
 >Line : Line<TPoint>
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
index 068e913891b..63ad5111ad3 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
@@ -25,12 +25,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export class Point3d extends Point {
 >Point3d : Point3d
@@ -50,16 +50,16 @@ module A {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export class Line<TPoint extends Point>{
 >Line : Line<TPoint>
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
index 76e13892cb7..7a9e5205d76 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
@@ -44,12 +44,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >p : Point
 >  : ^^^^^
     }
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
index 8cce9ca774b..ec8bc29175f 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
@@ -44,12 +44,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >p : Point
 >  : ^^^^^
     }
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
index b02e0cea07d..36ce1aa0845 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
@@ -44,12 +44,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >p : Point
 >  : ^^^^^
     }
diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index 4ed5c8d7b1f..b7815335623 100644
--- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -22,12 +22,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export interface Point3d extends Point {
         z: number;
@@ -42,16 +42,16 @@ module A {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export interface Line<TPoint extends Point>{
         new (start: TPoint, end: TPoint);
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
index 70ed97198b0..d524b106b6e 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
@@ -22,12 +22,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export interface Point3d extends Point {
         z: number;
@@ -42,16 +42,16 @@ module A {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export interface Line<TPoint extends Point>{
         new (start: TPoint, end: TPoint);
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
index 6344390aa5f..180f772f4c5 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
@@ -27,10 +27,10 @@ module A {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
         export class Line {
 >Line : Line
@@ -59,12 +59,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >p : Point
 >  : ^^^^^
             }
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
index 80444bbf6a6..1ede2d434df 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
@@ -23,12 +23,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export var Unity = { start: new Point(0, 0), end: new Point(1, 0) };
 >Unity : { start: Point; end: Point; }
@@ -41,19 +41,19 @@ module A {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 >end : Point
 >    : ^^^^^
 >new Point(1, 0) : Point
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
index 24701d5932e..b95b6f74f91 100644
--- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
@@ -23,11 +23,11 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
index 4184580d4e4..0b78f671e13 100644
--- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
@@ -23,12 +23,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     interface Point3d extends Point {
         z: number;
@@ -44,15 +44,15 @@ module A {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types
index 26411eb483c..f7c21cf2635 100644
--- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types
@@ -18,10 +18,10 @@ module X.Y {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
index add83c3e7b4..86293d379a2 100644
--- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
@@ -61,8 +61,8 @@ var y = new enumdule.Point(0, 0);
 >         : ^^^^^^^^^^^^^^^
 >Point : typeof enumdule.Point
 >      : ^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types
index 260259685a6..2c9bcc56bbb 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types
@@ -64,12 +64,12 @@ module Geometry {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     // this is valid since B.Line _is_ visible outside Geometry
     export var Unit: Lines.Line = new Lines.Line(Origin, { x: 1, y: 0 });
@@ -91,12 +91,12 @@ module Geometry {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 // expected to work since all are exported
diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.types b/tests/baselines/reference/NonInitializedExportInInternalModule.types
index 3a63cacd2cb..a1da3d7d020 100644
--- a/tests/baselines/reference/NonInitializedExportInInternalModule.types
+++ b/tests/baselines/reference/NonInitializedExportInInternalModule.types
@@ -106,14 +106,14 @@ module Inner {
     export var c1: string = 'a';
 >c1 : string
 >   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
     export let d1: number = 1;
 >d1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     class D {}
 >D : D
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
index 7984af2fa02..df868ced093 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
@@ -53,12 +53,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 === part2.ts ===
@@ -70,8 +70,8 @@ module A {
     var Origin: string = "0,0";
 >Origin : string
 >       : ^^^^^^
->"0,0" : string
->      : ^^^^^^
+>"0,0" : "0,0"
+>      : ^^^^^
 
     export module Utils {
 >Utils : typeof Utils
@@ -176,11 +176,11 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types
index 98b6e3e985e..cf8deaad970 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types
@@ -54,12 +54,12 @@ export module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 === part2.ts ===
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
index 3767c3ceb0e..1e0e29ec3dd 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
@@ -74,12 +74,12 @@ module otherRoot {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         export module Utils {
 >Utils : typeof Utils
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
index a78065a8efc..2e2e43b4cc3 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
@@ -60,12 +60,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     export module Utils {
 >Utils : typeof Utils
@@ -170,11 +170,11 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
diff --git a/tests/baselines/reference/VariableDeclaration10_es6.types b/tests/baselines/reference/VariableDeclaration10_es6.types
index 0614609252e..e2666c8e64b 100644
--- a/tests/baselines/reference/VariableDeclaration10_es6.types
+++ b/tests/baselines/reference/VariableDeclaration10_es6.types
@@ -4,6 +4,6 @@
 let a: number = 1
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/VariableDeclaration5_es6.types b/tests/baselines/reference/VariableDeclaration5_es6.types
index aa986f485e1..7fa662ec3f3 100644
--- a/tests/baselines/reference/VariableDeclaration5_es6.types
+++ b/tests/baselines/reference/VariableDeclaration5_es6.types
@@ -4,6 +4,6 @@
 const a: number = 1
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/abstractPropertyInConstructor.types b/tests/baselines/reference/abstractPropertyInConstructor.types
index 2641405dec6..ecea08864d6 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.types
+++ b/tests/baselines/reference/abstractPropertyInConstructor.types
@@ -50,16 +50,16 @@ abstract class AbstractClass {
 >    : ^^^^^^
 
             this.prop = "Hello World";
->this.prop = "Hello World" : string
->                          : ^^^^^^
+>this.prop = "Hello World" : "Hello World"
+>                          : ^^^^^^^^^^^^^
 >this.prop : string
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >prop : string
 >     : ^^^^^^
->"Hello World" : string
->              : ^^^^^^
+>"Hello World" : "Hello World"
+>              : ^^^^^^^^^^^^^
         }
         this.cb(str);
 >this.cb(str) : void
@@ -235,8 +235,8 @@ abstract class DerivedAbstractClass extends AbstractClass {
 >     : ^^^^
 >method : (num: number) => void
 >       : ^   ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         // OK, references are to another instance
         other.cb(other.prop);
@@ -383,8 +383,8 @@ class User {
 >  : ^^^^^^^^^^^^^
 >cb : (s: string) => void
 >   : ^ ^^      ^^^^^    
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
         a.method(12);
 >a.method(12) : void
@@ -395,8 +395,8 @@ class User {
 >  : ^^^^^^^^^^^^^
 >method : (num: number) => void
 >       : ^   ^^      ^^^^^    
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
         a.method2();
 >a.method2() : void
diff --git a/tests/baselines/reference/abstractPropertyNegative.types b/tests/baselines/reference/abstractPropertyNegative.types
index 9db3805385e..eb11f44c3c3 100644
--- a/tests/baselines/reference/abstractPropertyNegative.types
+++ b/tests/baselines/reference/abstractPropertyNegative.types
@@ -150,8 +150,8 @@ abstract class AbstractAccessorMismatch {
     get p2(): string { return "should work"; }
 >p2 : string
 >   : ^^^^^^
->"should work" : string
->              : ^^^^^^
+>"should work" : "should work"
+>              : ^^^^^^^^^^^^^
 
     abstract set p2(val: string);
 >p2 : string
diff --git a/tests/baselines/reference/acceptSymbolAsWeakType.types b/tests/baselines/reference/acceptSymbolAsWeakType.types
index f1bfa2f4191..d4bb065082c 100644
--- a/tests/baselines/reference/acceptSymbolAsWeakType.types
+++ b/tests/baselines/reference/acceptSymbolAsWeakType.types
@@ -8,8 +8,8 @@ const s: symbol = Symbol('s');
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
 const ws = new WeakSet([s]);
 >ws : WeakSet<symbol>
diff --git a/tests/baselines/reference/accessorAccidentalCallDiagnostic.types b/tests/baselines/reference/accessorAccidentalCallDiagnostic.types
index 640c6186d43..84013fe02eb 100644
--- a/tests/baselines/reference/accessorAccidentalCallDiagnostic.types
+++ b/tests/baselines/reference/accessorAccidentalCallDiagnostic.types
@@ -9,8 +9,8 @@ class Test24554 {
     get property(): number { return 1; }
 >property : number
 >         : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 function test24554(x: Test24554) {
 >test24554 : (x: Test24554) => any
diff --git a/tests/baselines/reference/accessorsAreNotContextuallyTyped.types b/tests/baselines/reference/accessorsAreNotContextuallyTyped.types
index 14dc66698f1..05c4f38258f 100644
--- a/tests/baselines/reference/accessorsAreNotContextuallyTyped.types
+++ b/tests/baselines/reference/accessorsAreNotContextuallyTyped.types
@@ -25,8 +25,8 @@ class C {
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 }
 
@@ -45,6 +45,6 @@ var r = c.x(''); // string
 >  : ^
 >x : (a: string) => string
 >  : ^ ^^      ^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/accessors_spec_section-4.5_error-cases.types b/tests/baselines/reference/accessors_spec_section-4.5_error-cases.types
index e5154d2cdc8..02277c63ea0 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_error-cases.types
+++ b/tests/baselines/reference/accessors_spec_section-4.5_error-cases.types
@@ -14,14 +14,14 @@ class LanguageSpec_section_4_5_error_cases {
     public get AnnotatedSetter_SetterFirst() { return ""; }
 >AnnotatedSetter_SetterFirst : number
 >                            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     public get AnnotatedSetter_SetterLast() { return ""; }
 >AnnotatedSetter_SetterLast : number
 >                           : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     public set AnnotatedSetter_SetterLast(a: number) { }
 >AnnotatedSetter_SetterLast : number
@@ -32,36 +32,36 @@ class LanguageSpec_section_4_5_error_cases {
     public get AnnotatedGetter_GetterFirst(): string { return ""; }
 >AnnotatedGetter_GetterFirst : string
 >                            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     public set AnnotatedGetter_GetterFirst(aStr) { aStr = 0; }
 >AnnotatedGetter_GetterFirst : string
 >                            : ^^^^^^
 >aStr : string
 >     : ^^^^^^
->aStr = 0 : number
->         : ^^^^^^
+>aStr = 0 : 0
+>         : ^
 >aStr : string
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public set AnnotatedGetter_GetterLast(aStr) { aStr = 0; }
 >AnnotatedGetter_GetterLast : string
 >                           : ^^^^^^
 >aStr : string
 >     : ^^^^^^
->aStr = 0 : number
->         : ^^^^^^
+>aStr = 0 : 0
+>         : ^
 >aStr : string
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public get AnnotatedGetter_GetterLast(): string { return ""; }
 >AnnotatedGetter_GetterLast : string
 >                           : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
diff --git a/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types b/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types
index a2001276ef4..25a393584b9 100644
--- a/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types
+++ b/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types
@@ -24,6 +24,6 @@ var kitty = a(1);
 >     : ^^^^^^
 >a : Bar
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types
index ded5ff83d9d..66f175425ae 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.types
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.types
@@ -19,8 +19,8 @@ z.bar("hello"); // This should be ok
 >  : ^^^
 >bar : (name: string) => foo.A
 >    : ^    ^^      ^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
 >x : foo.A
diff --git a/tests/baselines/reference/allowImportClausesToMergeWithTypes.types b/tests/baselines/reference/allowImportClausesToMergeWithTypes.types
index b0f8d12541e..6e2d25d7535 100644
--- a/tests/baselines/reference/allowImportClausesToMergeWithTypes.types
+++ b/tests/baselines/reference/allowImportClausesToMergeWithTypes.types
@@ -29,8 +29,8 @@ const x: zzz = { x: "" };
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 zzz;
 >zzz : 123
@@ -54,8 +54,8 @@ const x: zzz = { x: "" };
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 zzz;
 >zzz : 123
diff --git a/tests/baselines/reference/allowsImportingTsExtension.types b/tests/baselines/reference/allowsImportingTsExtension.types
index 2f6a3a58bdc..c1fe54623e5 100644
--- a/tests/baselines/reference/allowsImportingTsExtension.types
+++ b/tests/baselines/reference/allowsImportingTsExtension.types
@@ -31,8 +31,8 @@ const aPromise = import("./a.ts"); // error
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./a.ts") : Promise<typeof import("a")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.ts" : string
->         : ^^^^^^
+>"./a.ts" : "./a.ts"
+>         : ^^^^^^^^
 
 === c.ts ===
 import type { A } from "./a.d.ts"; // ok
@@ -55,6 +55,6 @@ const aPromise = import("./a.d.ts"); // error
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./a.d.ts") : Promise<typeof import("a")>
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.d.ts" : string
->           : ^^^^^^
+>"./a.d.ts" : "./a.d.ts"
+>           : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ambientRequireFunction(module=commonjs).types b/tests/baselines/reference/ambientRequireFunction(module=commonjs).types
index c2fd2fef2b2..008c0aeefcc 100644
--- a/tests/baselines/reference/ambientRequireFunction(module=commonjs).types
+++ b/tests/baselines/reference/ambientRequireFunction(module=commonjs).types
@@ -10,8 +10,8 @@ const fs = require("fs");
 >              : ^^^^^^^^^
 >require : (moduleName: string) => any
 >        : ^          ^^      ^^^^^   
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 
 const text = fs.readFileSync("/a/b/c");
 >text : string
@@ -24,8 +24,8 @@ const text = fs.readFileSync("/a/b/c");
 >   : ^^^^^^^^^
 >readFileSync : (s: string) => string
 >             : ^ ^^      ^^^^^      
->"/a/b/c" : string
->         : ^^^^^^
+>"/a/b/c" : "/a/b/c"
+>         : ^^^^^^^^
 
 === node.d.ts ===
 declare function require(moduleName: string): any;
diff --git a/tests/baselines/reference/ambientRequireFunction(module=preserve).types b/tests/baselines/reference/ambientRequireFunction(module=preserve).types
index c2fd2fef2b2..008c0aeefcc 100644
--- a/tests/baselines/reference/ambientRequireFunction(module=preserve).types
+++ b/tests/baselines/reference/ambientRequireFunction(module=preserve).types
@@ -10,8 +10,8 @@ const fs = require("fs");
 >              : ^^^^^^^^^
 >require : (moduleName: string) => any
 >        : ^          ^^      ^^^^^   
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 
 const text = fs.readFileSync("/a/b/c");
 >text : string
@@ -24,8 +24,8 @@ const text = fs.readFileSync("/a/b/c");
 >   : ^^^^^^^^^
 >readFileSync : (s: string) => string
 >             : ^ ^^      ^^^^^      
->"/a/b/c" : string
->         : ^^^^^^
+>"/a/b/c" : "/a/b/c"
+>         : ^^^^^^^^
 
 === node.d.ts ===
 declare function require(moduleName: string): any;
diff --git a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.types b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.types
index 68d5fa0be5e..05081200ce3 100644
--- a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.types
+++ b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.types
@@ -76,8 +76,8 @@ class TestClass2 {
 >x : any
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
  
     public foo(x: string): number;
diff --git a/tests/baselines/reference/ambiguousOverload.types b/tests/baselines/reference/ambiguousOverload.types
index 65f6e531828..4b5d5820736 100644
--- a/tests/baselines/reference/ambiguousOverload.types
+++ b/tests/baselines/reference/ambiguousOverload.types
@@ -32,8 +32,8 @@ var x: number = foof("s", null);
 >                : ^^^^^^
 >foof : { (bar: string, y: any): number; (bar: string, x: any): string; }
 >     : ^^^   ^^      ^^ ^^^^^^^^      ^^^   ^^      ^^ ^^^^^^^^      ^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
 var y: string = foof("s", null);
 >y : string
@@ -42,8 +42,8 @@ var y: string = foof("s", null);
 >                : ^^^^^^
 >foof : { (bar: string, y: any): number; (bar: string, x: any): string; }
 >     : ^^^   ^^      ^^ ^^^^^^^^      ^^^   ^^      ^^ ^^^^^^^^      ^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
 function foof2(bar: string, x): string;
 >foof2 : { (bar: string, x: any): string; (bar: string, y: any): number; }
@@ -76,8 +76,8 @@ var x2: string = foof2("s", null);
 >                 : ^^^^^^
 >foof2 : { (bar: string, x: any): string; (bar: string, y: any): number; }
 >      : ^^^   ^^      ^^ ^^^^^^^^      ^^^   ^^      ^^ ^^^^^^^^      ^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
 var y2: number = foof2("s", null);
 >y2 : number
@@ -86,6 +86,6 @@ var y2: number = foof2("s", null);
 >                 : ^^^^^^
 >foof2 : { (bar: string, x: any): string; (bar: string, y: any): number; }
 >      : ^^^   ^^      ^^ ^^^^^^^^      ^^^   ^^      ^^ ^^^^^^^^      ^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
diff --git a/tests/baselines/reference/amdLikeInputDeclarationEmit.types b/tests/baselines/reference/amdLikeInputDeclarationEmit.types
index b78a73bc5c2..7f1cf023932 100644
--- a/tests/baselines/reference/amdLikeInputDeclarationEmit.types
+++ b/tests/baselines/reference/amdLikeInputDeclarationEmit.types
@@ -37,12 +37,12 @@ define("lib/ExtendedClass", ["deps/BaseClass"],
 >define("lib/ExtendedClass", ["deps/BaseClass"], /** * {typeof import("deps/BaseClass")} * @param  {typeof import("deps/BaseClass")} BaseClass  * @returns  */(BaseClass) => {            const ExtendedClass = BaseClass.extends({        f: function() {            return "something";        }    });    // Exports the module in a way tsc recognize class export     const module = {};    module.exports = ExtendedClass    return module.exports;}) : any
 >define : <T = unknown>(name: string, modules: string[], ready: (...modules: unknown[]) => T) => any
 >       : ^ ^^^^^^^^^^^^    ^^      ^^       ^^        ^^     ^^                            ^^^^^^^^
->"lib/ExtendedClass" : string
->                    : ^^^^^^
+>"lib/ExtendedClass" : "lib/ExtendedClass"
+>                    : ^^^^^^^^^^^^^^^^^^^
 >["deps/BaseClass"] : string[]
 >                   : ^^^^^^^^
->"deps/BaseClass" : string
->                 : ^^^^^^
+>"deps/BaseClass" : "deps/BaseClass"
+>                 : ^^^^^^^^^^^^^^^^
 
 /**
  * {typeof import("deps/BaseClass")}
diff --git a/tests/baselines/reference/amdModuleName1.types b/tests/baselines/reference/amdModuleName1.types
index b9f0c72d56f..31b0ba0700e 100644
--- a/tests/baselines/reference/amdModuleName1.types
+++ b/tests/baselines/reference/amdModuleName1.types
@@ -12,16 +12,16 @@ class Foo {
 
     constructor() {
         this.x = 5;
->this.x = 5 : number
->           : ^^^^^^
+>this.x = 5 : 5
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 export = Foo;
diff --git a/tests/baselines/reference/amdModuleName2.types b/tests/baselines/reference/amdModuleName2.types
index ae7a33fb380..2f78347b32e 100644
--- a/tests/baselines/reference/amdModuleName2.types
+++ b/tests/baselines/reference/amdModuleName2.types
@@ -13,16 +13,16 @@ class Foo {
 
     constructor() {
         this.x = 5;
->this.x = 5 : number
->           : ^^^^^^
+>this.x = 5 : 5
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 export = Foo;
diff --git a/tests/baselines/reference/anonterface.types b/tests/baselines/reference/anonterface.types
index d1e6f13c35e..8ffba4e4acf 100644
--- a/tests/baselines/reference/anonterface.types
+++ b/tests/baselines/reference/anonterface.types
@@ -61,8 +61,8 @@ c.m(function(n) { return "hello: "+n; },18);
 >          : ^^^^^^^^^
 >n : number
 >  : ^^^^^^
->18 : number
->   : ^^^^^^
+>18 : 18
+>   : ^^
 
 
 
diff --git a/tests/baselines/reference/argsInScope.types b/tests/baselines/reference/argsInScope.types
index 161bd53ab4c..f84dca6b837 100644
--- a/tests/baselines/reference/argsInScope.types
+++ b/tests/baselines/reference/argsInScope.types
@@ -57,10 +57,10 @@ c.P(1,2,3);
 >  : ^
 >P : (ii: number, j: number, k: number) => void
 >  : ^  ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/argumentExpressionContextualTyping.types b/tests/baselines/reference/argumentExpressionContextualTyping.types
index 84cc35b75ce..16a04fc2151 100644
--- a/tests/baselines/reference/argumentExpressionContextualTyping.types
+++ b/tests/baselines/reference/argumentExpressionContextualTyping.types
@@ -101,10 +101,10 @@ var o1: { x: [string, number], y: { c: boolean, d: string, e: number } } = { x:
 >  : ^^^^^^^^^^^^^^^^
 >["string", 1] : [string, number]
 >              : ^^^^^^^^^^^^^^^^
->"string" : string
->         : ^^^^^^
->1 : number
->  : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>1 : 1
+>  : ^
 >y : { c: true; d: string; e: number; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ c: true, d: "world", e: 3 } : { c: true; d: string; e: number; }
@@ -115,12 +115,12 @@ var o1: { x: [string, number], y: { c: boolean, d: string, e: number } } = { x:
 >     : ^^^^
 >d : string
 >  : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 >e : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 foo(o1); // Not error since x has contextual type of tuple namely [string, number]
 >foo(o1) : void
@@ -179,10 +179,10 @@ var tuple: [string, number, boolean] = ["string", 1, true];
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >["string", 1, true] : [string, number, true]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^
->"string" : string
->         : ^^^^^^
->1 : number
->  : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -201,10 +201,10 @@ baz(["string", 1, true]);
 >    : ^ ^^                         ^^^^^^^^^
 >["string", 1, true] : [string, number, true]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^
->"string" : string
->         : ^^^^^^
->1 : number
->  : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -223,10 +223,10 @@ baz(["string", 1, true, ...array]);  // Error
 >    : ^ ^^                         ^^^^^^^^^
 >["string", 1, true, ...array] : [string, number, true, ...(string | number | boolean)[]]
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"string" : string
->         : ^^^^^^
->1 : number
->  : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 >...array : string | number | boolean
diff --git a/tests/baselines/reference/argumentsObjectCreatesRestForJs.types b/tests/baselines/reference/argumentsObjectCreatesRestForJs.types
index dfa17a45975..1a7e10458d4 100644
--- a/tests/baselines/reference/argumentsObjectCreatesRestForJs.types
+++ b/tests/baselines/reference/argumentsObjectCreatesRestForJs.types
@@ -67,8 +67,8 @@ jsdocced(1);
 >            : ^^^^
 >jsdocced : (x: number, ...args: any[]) => void
 >         : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function dontDoubleRest(x, ...y) { arguments; }
 >dontDoubleRest : (x: any, ...y: any[]) => void
diff --git a/tests/baselines/reference/argumentsSpreadRestIterables(target=es5).types b/tests/baselines/reference/argumentsSpreadRestIterables(target=es5).types
index 7711d276954..f6c3889ad00 100644
--- a/tests/baselines/reference/argumentsSpreadRestIterables(target=es5).types
+++ b/tests/baselines/reference/argumentsSpreadRestIterables(target=es5).types
@@ -30,8 +30,8 @@ declare const itNum: Iterable<number>
 >  : ^^^^^^
 >rest : Iterable<number>
 >     : ^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >...itNum : Iterable<number>
 >         : ^^^^^^^^^^^^^^^^
 >itNum : Iterable<number>
@@ -48,8 +48,8 @@ declare const itNum: Iterable<number>
 >  : ^^^^^^
 >rest : [boolean, ...Iterable<number>[]]
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >true : true
 >     : ^^^^
 >...itNum : Iterable<number>
diff --git a/tests/baselines/reference/argumentsSpreadRestIterables(target=esnext).types b/tests/baselines/reference/argumentsSpreadRestIterables(target=esnext).types
index 2c7fc3ec9f5..be4b8553796 100644
--- a/tests/baselines/reference/argumentsSpreadRestIterables(target=esnext).types
+++ b/tests/baselines/reference/argumentsSpreadRestIterables(target=esnext).types
@@ -30,8 +30,8 @@ declare const itNum: Iterable<number>
 >  : ^^^^^^
 >rest : number[]
 >     : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >...itNum : number
 >         : ^^^^^^
 >itNum : Iterable<number>
@@ -48,8 +48,8 @@ declare const itNum: Iterable<number>
 >  : ^^^^^^
 >rest : [boolean, ...number[]]
 >     : ^^^^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >true : true
 >     : ^^^^
 >...itNum : number
diff --git a/tests/baselines/reference/arrayAssignmentTest3.types b/tests/baselines/reference/arrayAssignmentTest3.types
index 659dac65e2b..a0685da6e11 100644
--- a/tests/baselines/reference/arrayAssignmentTest3.types
+++ b/tests/baselines/reference/arrayAssignmentTest3.types
@@ -30,8 +30,8 @@ var xx = new a(null, 7, new B());
 >                        : ^
 >a : typeof a
 >  : ^^^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 >new B() : B
 >        : ^
 >B : typeof B
diff --git a/tests/baselines/reference/arrayAugment.types b/tests/baselines/reference/arrayAugment.types
index 367f1183066..d9d62a0a524 100644
--- a/tests/baselines/reference/arrayAugment.types
+++ b/tests/baselines/reference/arrayAugment.types
@@ -28,8 +28,8 @@ var y = x.split(4);
 >  : ^^^^^^^^
 >split : (parts: number) => string[][]
 >      : ^     ^^      ^^^^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var y: string[][]; // Expect no error here
 >y : string[][]
diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types
index ea964b9a964..2ed7f2c9d8f 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.types
+++ b/tests/baselines/reference/arrayBestCommonTypes.types
@@ -404,8 +404,8 @@ module EmptyTypes {
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 >y : derived
 >  : ^^^^^^^
 >new derived() : derived
@@ -416,8 +416,8 @@ module EmptyTypes {
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : base
 >  : ^^^^
 >new base() : base
@@ -484,8 +484,8 @@ module EmptyTypes {
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >y : derived
 >  : ^^^^^^^
 >new derived() : derived
@@ -1086,8 +1086,8 @@ module NonEmptyTypes {
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 >y : derived
 >  : ^^^^^^^
 >new derived() : derived
@@ -1098,8 +1098,8 @@ module NonEmptyTypes {
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : base
 >  : ^^^^
 >new base() : base
@@ -1166,8 +1166,8 @@ module NonEmptyTypes {
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >y : derived
 >  : ^^^^^^^
 >new derived() : derived
diff --git a/tests/baselines/reference/arrayConstructors1.types b/tests/baselines/reference/arrayConstructors1.types
index ab16c3e2638..5466e353531 100644
--- a/tests/baselines/reference/arrayConstructors1.types
+++ b/tests/baselines/reference/arrayConstructors1.types
@@ -14,8 +14,8 @@ x = new Array(1);
 >             : ^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x = new Array('hi', 'bye'); 
 >x = new Array('hi', 'bye') : string[]
@@ -26,10 +26,10 @@ x = new Array('hi', 'bye');
 >                       : ^^^^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->'hi' : string
->     : ^^^^^^
->'bye' : string
->      : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
+>'bye' : "bye"
+>      : ^^^^^
 
 x = new Array<string>('hi', 'bye');
 >x = new Array<string>('hi', 'bye') : string[]
@@ -40,10 +40,10 @@ x = new Array<string>('hi', 'bye');
 >                               : ^^^^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->'hi' : string
->     : ^^^^^^
->'bye' : string
->      : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
+>'bye' : "bye"
+>      : ^^^^^
 
 var y: number[];
 >y : number[]
@@ -58,8 +58,8 @@ y = new Array(1);
 >             : ^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 y = new Array(1,2);
 >y = new Array(1,2) : number[]
@@ -70,10 +70,10 @@ y = new Array(1,2);
 >               : ^^^^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 y = new Array<number>(1, 2);
 >y = new Array<number>(1, 2) : number[]
@@ -84,8 +84,8 @@ y = new Array<number>(1, 2);
 >                        : ^^^^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/arrayEvery.types b/tests/baselines/reference/arrayEvery.types
index 421ab67c56c..6210757b88e 100644
--- a/tests/baselines/reference/arrayEvery.types
+++ b/tests/baselines/reference/arrayEvery.types
@@ -6,8 +6,8 @@ const foo: (number | string)[] = ['aaa'];
 >    : ^^^^^^^^^^^^^^^^^^^
 >['aaa'] : string[]
 >        : ^^^^^^^^
->'aaa' : string
->      : ^^^^^^
+>'aaa' : "aaa"
+>      : ^^^^^
 
 const isString = (x: unknown): x is string => typeof x === 'string';
 >isString : (x: unknown) => x is string
@@ -50,7 +50,7 @@ if (foo.every(isString)) {
 >  : ^
 >slice : (start?: number, end?: number) => string
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/arrayFrom.types b/tests/baselines/reference/arrayFrom.types
index 9b4cd4a9b69..d8c53ad231c 100644
--- a/tests/baselines/reference/arrayFrom.types
+++ b/tests/baselines/reference/arrayFrom.types
@@ -35,8 +35,8 @@ const inputALike: ArrayLike<A> = { length: 0 };
 >              : ^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const inputARand = getEither(inputA, inputALike);
 >inputARand : ArrayLike<A> | Iterable<A>
diff --git a/tests/baselines/reference/arrayFromAsync.types b/tests/baselines/reference/arrayFromAsync.types
index e1a917f58c5..abea2cbd32d 100644
--- a/tests/baselines/reference/arrayFromAsync.types
+++ b/tests/baselines/reference/arrayFromAsync.types
@@ -88,8 +88,8 @@ const arrLike = {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     1: Promise.resolve(2),
 >1 : Promise<number>
@@ -102,8 +102,8 @@ const arrLike = {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     2: Promise.resolve(4),
 >2 : Promise<number>
@@ -116,8 +116,8 @@ const arrLike = {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
     3: Promise.resolve(6),
 >3 : Promise<number>
@@ -130,8 +130,8 @@ const arrLike = {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
     length: 4,
 >length : number
@@ -208,8 +208,8 @@ const sameArr2 = await Array.fromAsync([Promise.resolve(0), Promise.resolve(2),
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >Promise.resolve(2) : Promise<number>
 >                   : ^^^^^^^^^^^^^^^
 >Promise.resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
@@ -218,8 +218,8 @@ const sameArr2 = await Array.fromAsync([Promise.resolve(0), Promise.resolve(2),
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >Promise.resolve(4) : Promise<number>
 >                   : ^^^^^^^^^^^^^^^
 >Promise.resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
@@ -228,8 +228,8 @@ const sameArr2 = await Array.fromAsync([Promise.resolve(0), Promise.resolve(2),
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >Promise.resolve(6) : Promise<number>
 >                   : ^^^^^^^^^^^^^^^
 >Promise.resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
@@ -238,8 +238,8 @@ const sameArr2 = await Array.fromAsync([Promise.resolve(0), Promise.resolve(2),
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
 const sameArr3 = await Array.fromAsync(genPromises(4));
 >sameArr3 : number[]
@@ -367,14 +367,14 @@ const mapArr2 = await Array.fromAsync([0,2,4,6], v => Promise.resolve(v ** 2));
 >          : ^^^ ^^                   ^^                                                                               ^^^            ^^^ ^^ ^^                   ^^                                             ^^     ^^                        ^^       ^^^   ^^^                     ^^^
 >[0,2,4,6] : number[]
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>2 : 2
+>  : ^
+>4 : 4
+>  : ^
+>6 : 6
+>  : ^
 >v => Promise.resolve(v ** 2) : (v: number) => Promise<number>
 >                             : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >v : number
@@ -409,14 +409,14 @@ const mapArr3 = await Array.fromAsync([0,2,4,6], v => v ** 2);
 >          : ^^^ ^^                   ^^                                                                               ^^^            ^^^ ^^ ^^                   ^^                                             ^^     ^^                        ^^       ^^^   ^^^                     ^^^
 >[0,2,4,6] : number[]
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>2 : 2
+>  : ^
+>4 : 4
+>  : ^
+>6 : 6
+>  : ^
 >v => v ** 2 : (v: number) => number
 >            : ^ ^^^^^^^^^^^^^^^^^^^
 >v : number
diff --git a/tests/baselines/reference/arrayLiteral.types b/tests/baselines/reference/arrayLiteral.types
index 5f0209268c0..d1651fe6d27 100644
--- a/tests/baselines/reference/arrayLiteral.types
+++ b/tests/baselines/reference/arrayLiteral.types
@@ -16,8 +16,8 @@ var x = new Array(1);
 >             : ^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var y = [1];
 >y : number[]
@@ -58,26 +58,26 @@ var x2: number[] = new Array(1);
 >             : ^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var y2: number[] = [1];
 >y2 : number[]
 >   : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var y2: number[] = [1, 2];
 >y2 : number[]
 >   : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var y2: number[] = new Array<number>();
 >y2 : number[]
diff --git a/tests/baselines/reference/arrayLiteralExpressionContextualTyping.types b/tests/baselines/reference/arrayLiteralExpressionContextualTyping.types
index e4d3b8eb4ea..72918ef0fd0 100644
--- a/tests/baselines/reference/arrayLiteralExpressionContextualTyping.types
+++ b/tests/baselines/reference/arrayLiteralExpressionContextualTyping.types
@@ -33,12 +33,12 @@ var tup: [number, number, number] = [1, 2, 3, 4];
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, 4] : [number, number, number, number]
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >4 : 4
 >  : ^
 
@@ -47,12 +47,12 @@ var tup1: [number|string, number|string, number|string] = [1, 2, 3, "string"];
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, "string"] : [number, number, number, string]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >"string" : "string"
 >         : ^^^^^^^^
 
@@ -61,12 +61,12 @@ var tup2: [number, number, number] = [1, 2, 3, "string"];  // Error
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, "string"] : [number, number, number, string]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >"string" : "string"
 >         : ^^^^^^^^
 
@@ -109,12 +109,12 @@ var spr2:[number, number, number] = [1, 2, 3, ...tup];  // Error
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, ...tup] : [number, number, number, number, number, number]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >...tup : number
 >       : ^^^^^^
 >tup : [number, number, number]
diff --git a/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types b/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
index 49389068068..f180e702528 100644
--- a/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
+++ b/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
@@ -16,8 +16,8 @@ panic([], 'one', 'two');
 >      : ^   ^^        ^^^^^   ^^        ^^^^^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->'one' : string
->      : ^^^^^^
->'two' : string
->      : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
+>'two' : "two"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/arrayLiteralTypeInference.types b/tests/baselines/reference/arrayLiteralTypeInference.types
index ebb0ec155f9..2bca065e13b 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.types
+++ b/tests/baselines/reference/arrayLiteralTypeInference.types
@@ -43,8 +43,8 @@ var x1: Action[] = [
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >trueness : boolean
 >         : ^^^^^^^
 >false : false
@@ -55,8 +55,8 @@ var x1: Action[] = [
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >name : string
 >     : ^^^^^^
 >"three" : "three"
@@ -125,8 +125,8 @@ var z1: { id: number }[] =
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >trueness : boolean
 >         : ^^^^^^^
 >false : false
@@ -137,8 +137,8 @@ var z1: { id: number }[] =
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >name : string
 >     : ^^^^^^
 >"three" : "three"
diff --git a/tests/baselines/reference/arrayLiterals.types b/tests/baselines/reference/arrayLiterals.types
index 713df4ecc38..5b4d21f2acf 100644
--- a/tests/baselines/reference/arrayLiterals.types
+++ b/tests/baselines/reference/arrayLiterals.types
@@ -143,12 +143,12 @@ var context1: { [n: number]: { a: string; b: number; }; } = [{ a: '', b: 0, c: '
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >c : string
 >  : ^^^^^^
 >'' : ""
@@ -157,12 +157,12 @@ var context1: { [n: number]: { a: string; b: number; }; } = [{ a: '', b: 0, c: '
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >c : number
 >  : ^^^^^^
 >0 : 0
diff --git a/tests/baselines/reference/arrayLiterals2ES5.types b/tests/baselines/reference/arrayLiterals2ES5.types
index d5358f90e2a..9aafa39a922 100644
--- a/tests/baselines/reference/arrayLiterals2ES5.types
+++ b/tests/baselines/reference/arrayLiterals2ES5.types
@@ -116,18 +116,18 @@ var b1: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >                                 : ^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >["hello", "string"] : string[]
 >                    : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // The resulting type an array literal expression is determined as follows:
 //     - If the array literal contains no spread elements and is an array assignment pattern in a destructuring assignment (section 4.17.1),
@@ -193,18 +193,18 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >                                 : ^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >["hello", "string"] : string[]
 >                    : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 var temp3 = [undefined, null, undefined];
 >temp3 : any[]
diff --git a/tests/baselines/reference/arrayLiterals2ES6.types b/tests/baselines/reference/arrayLiterals2ES6.types
index 40899e37ced..dedb8257fb6 100644
--- a/tests/baselines/reference/arrayLiterals2ES6.types
+++ b/tests/baselines/reference/arrayLiterals2ES6.types
@@ -116,18 +116,18 @@ var b1: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >                                 : ^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >["hello", "string"] : string[]
 >                    : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // The resulting type an array literal expression is determined as follows:
 //     - If the array literal contains no spread elements and is an array assignment pattern in a destructuring assignment (section 4.17.1),
@@ -193,18 +193,18 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >                                 : ^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >["hello", "string"] : string[]
 >                    : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 interface myArray extends Array<Number> { }
 interface myArray2 extends Array<Number|String> { }
diff --git a/tests/baselines/reference/arrayLiterals3.types b/tests/baselines/reference/arrayLiterals3.types
index cda3251aea3..a1ea1c43214 100644
--- a/tests/baselines/reference/arrayLiterals3.types
+++ b/tests/baselines/reference/arrayLiterals3.types
@@ -23,8 +23,8 @@ var a1: [boolean, string, number] = ["string", 1, true];  // Error
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >"string" : "string"
 >         : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -39,10 +39,10 @@ var [b1, b2]: [number, number] = [1, 2, "string", true];
 >   : ^^^^^^
 >[1, 2, "string", true] : [number, number, string, boolean]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >"string" : "string"
 >         : ^^^^^^^^
 >true : true
@@ -82,18 +82,18 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >                                 : ^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >["hello", "string"] : string[]
 >                    : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 interface tup {
     0: number[]|string[];
diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.types b/tests/baselines/reference/arrayOfFunctionTypes3.types
index b626cfca92a..fc811643c30 100644
--- a/tests/baselines/reference/arrayOfFunctionTypes3.types
+++ b/tests/baselines/reference/arrayOfFunctionTypes3.types
@@ -117,8 +117,8 @@ var r5b = r4(1);
 >      : ^^^^^^
 >r4 : { (x: number): number; (x: any): any; }
 >   : ^^^ ^^      ^^^      ^^^ ^^   ^^^   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var a2: { <T>(x: T): number; (x: string): string;};
 >a2 : { <T>(x: T): number; (x: string): string; }
@@ -171,6 +171,6 @@ var r7 = r6(''); // any not string
 >r6('') : any
 >r6 : { (x: number): number; <T>(x: T): any; }
 >   : ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^   ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/arraySigChecking.types b/tests/baselines/reference/arraySigChecking.types
index c487e18a097..0161cac12d1 100644
--- a/tests/baselines/reference/arraySigChecking.types
+++ b/tests/baselines/reference/arraySigChecking.types
@@ -111,8 +111,8 @@ isEmpty(new Array(3));
 >             : ^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 isEmpty(new Array<string>(3));
 >isEmpty(new Array<string>(3)) : boolean
@@ -123,8 +123,8 @@ isEmpty(new Array<string>(3));
 >                     : ^^^^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 isEmpty(['a']);
 >isEmpty(['a']) : boolean
diff --git a/tests/baselines/reference/arraySlice.types b/tests/baselines/reference/arraySlice.types
index 775ea52fca3..afa95b1d8db 100644
--- a/tests/baselines/reference/arraySlice.types
+++ b/tests/baselines/reference/arraySlice.types
@@ -14,8 +14,8 @@ arr.splice(1, 1);
 >    : ^^^^^^^^^^^^^^^^^^^
 >splice : { (start: number, deleteCount?: number): string[]; (start: number, deleteCount: number, ...items: string[]): string[]; } | { (start: number, deleteCount?: number): number[]; (start: number, deleteCount: number, ...items: number[]): number[]; }
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/arraySpreadInCall.types b/tests/baselines/reference/arraySpreadInCall.types
index c440a909f16..5bded461fc9 100644
--- a/tests/baselines/reference/arraySpreadInCall.types
+++ b/tests/baselines/reference/arraySpreadInCall.types
@@ -22,14 +22,14 @@ f1(1, 2, 3, 4, ...[5, 6]);
 >                          : ^^^^
 >f1 : (a: number, b: number, c: number, d: number, e: number, f: number) => void
 >   : ^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 >...[5, 6] : number
 >          : ^^^^^^
 >[5, 6] : [number, number]
@@ -50,26 +50,26 @@ f1(...[1], 2, 3, 4, 5, 6);
 >    : ^^^^^^^^
 >1 : 1
 >  : ^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 f1(1, 2, ...[3, 4], 5, 6);
 >f1(1, 2, ...[3, 4], 5, 6) : void
 >                          : ^^^^
 >f1 : (a: number, b: number, c: number, d: number, e: number, f: number) => void
 >   : ^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...[3, 4] : number
 >          : ^^^^^^
 >[3, 4] : [number, number]
@@ -78,28 +78,28 @@ f1(1, 2, ...[3, 4], 5, 6);
 >  : ^
 >4 : 4
 >  : ^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 f1(1, 2, ...[3], 4, ...[5, 6]);
 >f1(1, 2, ...[3], 4, ...[5, 6]) : void
 >                               : ^^^^
 >f1 : (a: number, b: number, c: number, d: number, e: number, f: number) => void
 >   : ^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...[3] : number
 >       : ^^^^^^
 >[3] : [number]
 >    : ^^^^^^^^
 >3 : 3
 >  : ^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >...[5, 6] : number
 >          : ^^^^^^
 >[5, 6] : [number, number]
diff --git a/tests/baselines/reference/arrayToLocaleStringES2015.types b/tests/baselines/reference/arrayToLocaleStringES2015.types
index 7e7ea0bef4c..20ef91c8aec 100644
--- a/tests/baselines/reference/arrayToLocaleStringES2015.types
+++ b/tests/baselines/reference/arrayToLocaleStringES2015.types
@@ -70,8 +70,8 @@ str = arr.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }); // OK
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const dates: readonly Date[] = [new Date(), new Date()];
 >dates : readonly Date[]
@@ -136,8 +136,8 @@ str = dates.toLocaleString('fr', { timeZone: 'UTC' }); // OK
 >                    : ^^^^^^^^^^^^^^^^^^^^^
 >timeZone : string
 >         : ^^^^^^
->'UTC' : string
->      : ^^^^^^
+>'UTC' : "UTC"
+>      : ^^^^^
 
 const mixed = [1, new Date(), 59782, new Date()];
 >mixed : (number | Date)[]
@@ -210,8 +210,8 @@ str = mixed.toLocaleString('de', { style: 'currency', currency: 'EUR' }); // OK
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 str = (mixed as ReadonlyArray<number | Date>).toLocaleString('de', { currency: 'EUR', style: 'currency', timeZone: 'UTC' }); // OK
 >str = (mixed as ReadonlyArray<number | Date>).toLocaleString('de', { currency: 'EUR', style: 'currency', timeZone: 'UTC' }) : string
@@ -236,16 +236,16 @@ str = (mixed as ReadonlyArray<number | Date>).toLocaleString('de', { currency: '
 >                                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 >style : "currency"
 >      : ^^^^^^^^^^
 >'currency' : "currency"
 >           : ^^^^^^^^^^
 >timeZone : string
 >         : ^^^^^^
->'UTC' : string
->      : ^^^^^^
+>'UTC' : "UTC"
+>      : ^^^^^
 
 const int8Array = new Int8Array(3);
 >int8Array : Int8Array
@@ -254,8 +254,8 @@ const int8Array = new Int8Array(3);
 >                 : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int8Array.toLocaleString(); // OK
 >str = int8Array.toLocaleString() : string
@@ -310,8 +310,8 @@ str = int8Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' });
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint8Array = new Uint8Array(3);
 >uint8Array : Uint8Array
@@ -320,8 +320,8 @@ const uint8Array = new Uint8Array(3);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint8Array.toLocaleString(); // OK
 >str = uint8Array.toLocaleString() : string
@@ -376,8 +376,8 @@ str = uint8Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' })
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint8ClampedArray = new Uint8ClampedArray(3);
 >uint8ClampedArray : Uint8ClampedArray
@@ -386,8 +386,8 @@ const uint8ClampedArray = new Uint8ClampedArray(3);
 >                         : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint8ClampedArray.toLocaleString(); // OK
 >str = uint8ClampedArray.toLocaleString() : string
@@ -442,8 +442,8 @@ str = uint8ClampedArray.toLocaleString('en-US', { style: 'currency', currency: '
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const int16Array = new Int16Array(3);
 >int16Array : Int16Array
@@ -452,8 +452,8 @@ const int16Array = new Int16Array(3);
 >                  : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int16Array.toLocaleString(); // OK
 >str = int16Array.toLocaleString() : string
@@ -508,8 +508,8 @@ str = int16Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' })
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint16Array = new Uint16Array(3);
 >uint16Array : Uint16Array
@@ -518,8 +518,8 @@ const uint16Array = new Uint16Array(3);
 >                   : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint16Array.toLocaleString(); // OK
 >str = uint16Array.toLocaleString() : string
@@ -574,8 +574,8 @@ str = uint16Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const int32Array = new Int32Array(3);
 >int32Array : Int32Array
@@ -584,8 +584,8 @@ const int32Array = new Int32Array(3);
 >                  : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int32Array.toLocaleString(); // OK
 >str = int32Array.toLocaleString() : string
@@ -640,8 +640,8 @@ str = int32Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' })
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint32Array = new Uint32Array(3);
 >uint32Array : Uint32Array
@@ -650,8 +650,8 @@ const uint32Array = new Uint32Array(3);
 >                   : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint32Array.toLocaleString(); // OK
 >str = uint32Array.toLocaleString() : string
@@ -706,8 +706,8 @@ str = uint32Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const float32Array = new Float32Array(3);
 >float32Array : Float32Array
@@ -716,8 +716,8 @@ const float32Array = new Float32Array(3);
 >                    : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = float32Array.toLocaleString(); // OK
 >str = float32Array.toLocaleString() : string
@@ -772,8 +772,8 @@ str = float32Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR'
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const float64Array = new Float64Array(3);
 >float64Array : Float64Array
@@ -782,8 +782,8 @@ const float64Array = new Float64Array(3);
 >                    : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = float64Array.toLocaleString(); // OK
 >str = float64Array.toLocaleString() : string
@@ -838,6 +838,6 @@ str = float64Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR'
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/arrayToLocaleStringES2020.types b/tests/baselines/reference/arrayToLocaleStringES2020.types
index 71d910edd5b..1fcd2b0d619 100644
--- a/tests/baselines/reference/arrayToLocaleStringES2020.types
+++ b/tests/baselines/reference/arrayToLocaleStringES2020.types
@@ -70,8 +70,8 @@ str = arr.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }); // OK
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const dates: readonly Date[] = [new Date(), new Date()];
 >dates : readonly Date[]
@@ -136,8 +136,8 @@ str = dates.toLocaleString('fr', { timeZone: 'UTC' }); // OK
 >                    : ^^^^^^^^^^^^^^^^^^^^^
 >timeZone : string
 >         : ^^^^^^
->'UTC' : string
->      : ^^^^^^
+>'UTC' : "UTC"
+>      : ^^^^^
 
 const mixed = [1, new Date(), 59782, new Date()];
 >mixed : (number | Date)[]
@@ -194,8 +194,8 @@ str = mixed.toLocaleString('de', { style: 'currency', currency: 'EUR' }); // OK
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 str = (mixed as ReadonlyArray<number | Date>).toLocaleString('de', { currency: 'EUR', style: 'currency', timeZone: 'UTC' }); // OK
 >str = (mixed as ReadonlyArray<number | Date>).toLocaleString('de', { currency: 'EUR', style: 'currency', timeZone: 'UTC' }) : string
@@ -220,16 +220,16 @@ str = (mixed as ReadonlyArray<number | Date>).toLocaleString('de', { currency: '
 >                                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 >style : "currency"
 >      : ^^^^^^^^^^
 >'currency' : "currency"
 >           : ^^^^^^^^^^
 >timeZone : string
 >         : ^^^^^^
->'UTC' : string
->      : ^^^^^^
+>'UTC' : "UTC"
+>      : ^^^^^
 
 const bigInts = [BigInt(1), BigInt(2), BigInt(3)];
 >bigInts : bigint[]
@@ -308,8 +308,8 @@ str = bigInts.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }); /
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const int8Array = new Int8Array(3);
 >int8Array : Int8Array
@@ -318,8 +318,8 @@ const int8Array = new Int8Array(3);
 >                 : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int8Array.toLocaleString(); // OK
 >str = int8Array.toLocaleString() : string
@@ -374,8 +374,8 @@ str = int8Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' });
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint8Array = new Uint8Array(3);
 >uint8Array : Uint8Array
@@ -384,8 +384,8 @@ const uint8Array = new Uint8Array(3);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint8Array.toLocaleString(); // OK
 >str = uint8Array.toLocaleString() : string
@@ -440,8 +440,8 @@ str = uint8Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' })
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint8ClampedArray = new Uint8ClampedArray(3);
 >uint8ClampedArray : Uint8ClampedArray
@@ -450,8 +450,8 @@ const uint8ClampedArray = new Uint8ClampedArray(3);
 >                         : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint8ClampedArray.toLocaleString(); // OK
 >str = uint8ClampedArray.toLocaleString() : string
@@ -506,8 +506,8 @@ str = uint8ClampedArray.toLocaleString('en-US', { style: 'currency', currency: '
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const int16Array = new Int16Array(3);
 >int16Array : Int16Array
@@ -516,8 +516,8 @@ const int16Array = new Int16Array(3);
 >                  : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int16Array.toLocaleString(); // OK
 >str = int16Array.toLocaleString() : string
@@ -572,8 +572,8 @@ str = int16Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' })
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint16Array = new Uint16Array(3);
 >uint16Array : Uint16Array
@@ -582,8 +582,8 @@ const uint16Array = new Uint16Array(3);
 >                   : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint16Array.toLocaleString(); // OK
 >str = uint16Array.toLocaleString() : string
@@ -638,8 +638,8 @@ str = uint16Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const int32Array = new Int32Array(3);
 >int32Array : Int32Array
@@ -648,8 +648,8 @@ const int32Array = new Int32Array(3);
 >                  : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int32Array.toLocaleString(); // OK
 >str = int32Array.toLocaleString() : string
@@ -704,8 +704,8 @@ str = int32Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' })
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const uint32Array = new Uint32Array(3);
 >uint32Array : Uint32Array
@@ -714,8 +714,8 @@ const uint32Array = new Uint32Array(3);
 >                   : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint32Array.toLocaleString(); // OK
 >str = uint32Array.toLocaleString() : string
@@ -770,8 +770,8 @@ str = uint32Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR' }
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const float32Array = new Float32Array(3);
 >float32Array : Float32Array
@@ -780,8 +780,8 @@ const float32Array = new Float32Array(3);
 >                    : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = float32Array.toLocaleString(); // OK
 >str = float32Array.toLocaleString() : string
@@ -836,8 +836,8 @@ str = float32Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR'
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const float64Array = new Float64Array(3);
 >float64Array : Float64Array
@@ -846,8 +846,8 @@ const float64Array = new Float64Array(3);
 >                    : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = float64Array.toLocaleString(); // OK
 >str = float64Array.toLocaleString() : string
@@ -902,8 +902,8 @@ str = float64Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR'
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const bigInt64Array = new BigInt64Array(3);
 >bigInt64Array : BigInt64Array
@@ -912,8 +912,8 @@ const bigInt64Array = new BigInt64Array(3);
 >                     : ^^^^^^^^^^^^^
 >BigInt64Array : BigInt64ArrayConstructor
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = bigInt64Array.toLocaleString(); // OK
 >str = bigInt64Array.toLocaleString() : string
@@ -968,8 +968,8 @@ str = bigInt64Array.toLocaleString('en-US', { style: 'currency', currency: 'EUR'
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 const bigIntUint64Array = new BigUint64Array(3);
 >bigIntUint64Array : BigUint64Array
@@ -978,8 +978,8 @@ const bigIntUint64Array = new BigUint64Array(3);
 >                      : ^^^^^^^^^^^^^^
 >BigUint64Array : BigUint64ArrayConstructor
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = bigIntUint64Array.toLocaleString(); // OK
 >str = bigIntUint64Array.toLocaleString() : string
@@ -1034,6 +1034,6 @@ str = bigIntUint64Array.toLocaleString('en-US', { style: 'currency', currency: '
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/arrayToLocaleStringES5.types b/tests/baselines/reference/arrayToLocaleStringES5.types
index 64c4d439b14..1ecc6c27e37 100644
--- a/tests/baselines/reference/arrayToLocaleStringES5.types
+++ b/tests/baselines/reference/arrayToLocaleStringES5.types
@@ -146,8 +146,8 @@ const int8Array = new Int8Array(3);
 >                 : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int8Array.toLocaleString(); // OK
 >str = int8Array.toLocaleString() : string
@@ -212,8 +212,8 @@ const uint8Array = new Uint8Array(3);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint8Array.toLocaleString(); // OK
 >str = uint8Array.toLocaleString() : string
@@ -278,8 +278,8 @@ const uint8ClampedArray = new Uint8ClampedArray(3);
 >                         : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint8ClampedArray.toLocaleString(); // OK
 >str = uint8ClampedArray.toLocaleString() : string
@@ -344,8 +344,8 @@ const int16Array = new Int16Array(3);
 >                  : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int16Array.toLocaleString(); // OK
 >str = int16Array.toLocaleString() : string
@@ -410,8 +410,8 @@ const uint16Array = new Uint16Array(3);
 >                   : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint16Array.toLocaleString(); // OK
 >str = uint16Array.toLocaleString() : string
@@ -476,8 +476,8 @@ const int32Array = new Int32Array(3);
 >                  : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = int32Array.toLocaleString(); // OK
 >str = int32Array.toLocaleString() : string
@@ -542,8 +542,8 @@ const uint32Array = new Uint32Array(3);
 >                   : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = uint32Array.toLocaleString(); // OK
 >str = uint32Array.toLocaleString() : string
@@ -608,8 +608,8 @@ const float32Array = new Float32Array(3);
 >                    : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = float32Array.toLocaleString(); // OK
 >str = float32Array.toLocaleString() : string
@@ -674,8 +674,8 @@ const float64Array = new Float64Array(3);
 >                    : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 str = float64Array.toLocaleString(); // OK
 >str = float64Array.toLocaleString() : string
diff --git a/tests/baselines/reference/arrayconcat.types b/tests/baselines/reference/arrayconcat.types
index c44783f8a5e..6cdcb06d06a 100644
--- a/tests/baselines/reference/arrayconcat.types
+++ b/tests/baselines/reference/arrayconcat.types
@@ -66,8 +66,8 @@ class parser {
 >        : ^^^^^^^^^^
 >sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
 >     : ^         ^^^^ ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^
->function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        } : (a: IOptions, b: IOptions) => number
->                                                                                                                                                                                                                                                                                                        : ^ ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
+>function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        } : (a: IOptions, b: IOptions) => 1 | -1 | 0
+>                                                                                                                                                                                                                                                                                                        : ^ ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : IOptions
 >  : ^^^^^^^^
 >b : IOptions
@@ -114,8 +114,8 @@ class parser {
 >      : ^^^^^^
 
                 return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             } else if (aName < bName) {
 >aName < bName : boolean
@@ -133,8 +133,8 @@ class parser {
 
             } else {
                 return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
             }
         });
 	}
diff --git a/tests/baselines/reference/arrowFunctionContexts.types b/tests/baselines/reference/arrowFunctionContexts.types
index 5af6607f241..d9b147d2034 100644
--- a/tests/baselines/reference/arrowFunctionContexts.types
+++ b/tests/baselines/reference/arrowFunctionContexts.types
@@ -56,8 +56,8 @@ window.setTimeout(() => null, 100);
 >           : ^^       ^^            ^^       ^^^      ^^^^^         ^^     ^^^^^      ^^^^^^       ^^            ^^       ^^^      ^^^^^         ^^     ^^^^^      ^
 >() => null : () => any
 >           : ^^^^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 // Arrow function as value in array literal
 
@@ -209,8 +209,8 @@ module M2 {
 >           : ^^       ^^            ^^       ^^^      ^^^^^         ^^     ^^^^^      ^^^^^^       ^^            ^^       ^^^      ^^^^^         ^^     ^^^^^      ^
 >() => null : () => any
 >           : ^^^^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     // Arrow function as value in array literal
 
diff --git a/tests/baselines/reference/arrowFunctionExpressions.types b/tests/baselines/reference/arrowFunctionExpressions.types
index 1eda309dbf6..8bf8f07feb2 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.types
+++ b/tests/baselines/reference/arrowFunctionExpressions.types
@@ -171,8 +171,8 @@ var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
 >         : ^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var p10 = ([{ value, done }]) => { };
 >p10 : ([{ value, done }]: [{ value: any; done: any; }]) => void
@@ -278,10 +278,10 @@ var e = arrrr()(3)()(4);
 >        : ^ ^^      ^^^^^^^^^^^^ ^^      ^^^^^^^^^^^
 >arrrr : () => (m: number) => () => (n: number) => number
 >      : ^^^^^^^ ^^      ^^^^^^^^^^^^ ^^      ^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 var e: number;
 >e : number
@@ -321,10 +321,10 @@ function someFn() {
 >       : ^ ^^      ^^^^^^^^^^^
 >arr : (n: number) => (p: number) => number
 >    : ^ ^^      ^^^^^^ ^^      ^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
 }
@@ -357,12 +357,12 @@ function someOtherFn() {
 >       : ^^^^^^
 >arr : (n: number) => string
 >    : ^ ^^      ^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 // Arrow function used in nested function in function
@@ -424,8 +424,8 @@ var f = (n: string) => {
 >      : ^^^^^^^^^^^^
 >fn : (x: number) => () => string
 >   : ^ ^^      ^^^^^^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 }
 var g = f('')();
 >g : string
@@ -436,8 +436,8 @@ var g = f('')();
 >      : ^^^^^^^^^^^^
 >f : (n: string) => () => string
 >  : ^ ^^      ^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var g: string;
 >g : string
@@ -492,8 +492,8 @@ var h = someOuterFn()('')()();
 >              : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^
 >someOuterFn : () => (n: string) => () => () => number
 >            : ^^^^^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 h.toExponential();
 >h.toExponential() : string
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types
index a8d0adf22c8..eaa9c7ceaa3 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types
@@ -12,12 +12,12 @@ var a = () => <Error>{ name: "foo", message: "bar" };
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >message : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var b = () => (<Error>{ name: "foo", message: "bar" });    
 >b : () => Error
@@ -32,12 +32,12 @@ var b = () => (<Error>{ name: "foo", message: "bar" });
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >message : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var c = () => ({ name: "foo", message: "bar" });           
 >c : () => { name: string; message: string; }
@@ -74,10 +74,10 @@ var d = () => ((<Error>({ name: "foo", message: "bar" })));
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >message : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types
index 9c5ea6fc1c6..e12e0f67955 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types
@@ -12,12 +12,12 @@ var a = () => <Error>{ name: "foo", message: "bar" };
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >message : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var b = () => (<Error>{ name: "foo", message: "bar" });    
 >b : () => Error
@@ -32,12 +32,12 @@ var b = () => (<Error>{ name: "foo", message: "bar" });
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >message : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var c = () => ({ name: "foo", message: "bar" });           
 >c : () => { name: string; message: string; }
@@ -74,10 +74,10 @@ var d = () => ((<Error>({ name: "foo", message: "bar" })));
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >message : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/asOperator1.types b/tests/baselines/reference/asOperator1.types
index 9655658e0b0..5d21f6b5385 100644
--- a/tests/baselines/reference/asOperator1.types
+++ b/tests/baselines/reference/asOperator1.types
@@ -42,14 +42,14 @@ var j = 32 as number|string;
 >  : ^^^^^^^^^^^^^^^
 >32 as number|string : string | number
 >                    : ^^^^^^^^^^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
 j = '';
->j = '' : string
->       : ^^^^^^
+>j = '' : ""
+>       : ^^
 >j : string | number
 >  : ^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/asOperator2.types b/tests/baselines/reference/asOperator2.types
index 956c379baa1..17e654c8ffd 100644
--- a/tests/baselines/reference/asOperator2.types
+++ b/tests/baselines/reference/asOperator2.types
@@ -6,6 +6,6 @@ var x = 23 as string;
 >  : ^^^^^^
 >23 as string : string
 >             : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
diff --git a/tests/baselines/reference/asOperator3.types b/tests/baselines/reference/asOperator3.types
index 0a6ecd32f5a..d74ba8200cc 100644
--- a/tests/baselines/reference/asOperator3.types
+++ b/tests/baselines/reference/asOperator3.types
@@ -64,8 +64,8 @@ var e = `Hello` as string;
 >  : ^^^^^^
 >`Hello` as string : string
 >                  : ^^^^^^
->`Hello` : string
->        : ^^^^^^
+>`Hello` : "Hello"
+>        : ^^^^^^^
 
 var f = 1 + `${1} end of string` as string;
 >f : string
diff --git a/tests/baselines/reference/assertionFunctionWildcardImport2.types b/tests/baselines/reference/assertionFunctionWildcardImport2.types
index b6184051c4a..bf742e7e4de 100644
--- a/tests/baselines/reference/assertionFunctionWildcardImport2.types
+++ b/tests/baselines/reference/assertionFunctionWildcardImport2.types
@@ -26,8 +26,8 @@ function isNonNullable<T>(obj: T): asserts obj is NonNullable<T> {
 >                                          : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Must not be a nullable value" : string
->                               : ^^^^^^
+>"Must not be a nullable value" : "Must not be a nullable value"
+>                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/assertionTypePredicates2.types b/tests/baselines/reference/assertionTypePredicates2.types
index 074dca83cec..98abaa14e2d 100644
--- a/tests/baselines/reference/assertionTypePredicates2.types
+++ b/tests/baselines/reference/assertionTypePredicates2.types
@@ -59,8 +59,8 @@ export const main = () => {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     foo(a);
 >foo(a) : void
diff --git a/tests/baselines/reference/assign1.types b/tests/baselines/reference/assign1.types
index 99c5f9a75ed..b801da8afa8 100644
--- a/tests/baselines/reference/assign1.types
+++ b/tests/baselines/reference/assign1.types
@@ -22,11 +22,11 @@ module M {
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >salt : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >pepper : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/assignmentCompatBug2.types b/tests/baselines/reference/assignmentCompatBug2.types
index 1fa38a30cce..acaf0e92847 100644
--- a/tests/baselines/reference/assignmentCompatBug2.types
+++ b/tests/baselines/reference/assignmentCompatBug2.types
@@ -34,8 +34,8 @@ b2 = {b: 0, a: 0 };
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >a : number
 >  : ^^^^^^
 >0 : 0
@@ -76,8 +76,8 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     g: (s) => { return 0; },
 >g : (s: string) => number
@@ -86,14 +86,14 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     m: 0,
 >m : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 }; // ok
 
@@ -112,8 +112,8 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     g: (s) => { return 0; },
 >g : (s: string) => number
@@ -122,8 +122,8 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 }; // error
 
@@ -142,14 +142,14 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     m: 0,
 >m : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 }; // error
 
@@ -168,8 +168,8 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     g: (s) => { return 0; },
 >g : (s: string) => number
@@ -178,20 +178,20 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     m: 0,
 >m : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     n: 0,
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     k: (a) =>{ return null; },
 >k : (a: any) => any
@@ -218,8 +218,8 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     g: (s) => { return 0; },
 >g : (s: string) => number
@@ -228,14 +228,14 @@ b3 = {
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     n: 0,
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     k: (a) =>{ return null; },
 >k : (a: any) => any
diff --git a/tests/baselines/reference/assignmentCompatBug5.types b/tests/baselines/reference/assignmentCompatBug5.types
index 5949f59156f..61f3aa0fdd2 100644
--- a/tests/baselines/reference/assignmentCompatBug5.types
+++ b/tests/baselines/reference/assignmentCompatBug5.types
@@ -34,10 +34,10 @@ foo2(["s", "t"]);
 >     : ^ ^^        ^^^^^^^^^
 >["s", "t"] : string[]
 >           : ^^^^^^^^
->"s" : string
->    : ^^^^^^
->"t" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
+>"t" : "t"
+>    : ^^^
 
 function foo3(x: (n: number) =>number) { };
 >foo3 : (x: (n: number) => number) => void
diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.types b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.types
index a9fa2a3370f..10d8a830b9c 100644
--- a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.types
+++ b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.types
@@ -20,8 +20,8 @@ foo({ id: 1234 });                 // Ok
 >             : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1234 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
 
 foo({ id: 1234, name: "hello" });  // Ok
 >foo({ id: 1234, name: "hello" }) : void
@@ -32,12 +32,12 @@ foo({ id: 1234, name: "hello" });  // Ok
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1234 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
 >name : string
 >     : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 foo({ id: 1234, name: false });    // Error, name of wrong type
 >foo({ id: 1234, name: false }) : void
@@ -48,8 +48,8 @@ foo({ id: 1234, name: false });    // Error, name of wrong type
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1234 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
 >name : boolean
 >     : ^^^^^^^
 >false : false
@@ -64,6 +64,6 @@ foo({ name: "hello" });            // Error, id required but missing
 >                  : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
index 9ab31713e75..d8155c6bf4f 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
@@ -59,8 +59,8 @@ var a: () => number;
 >  : ^^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (x?: number) => 1; // ok, same number of required params
 >a = (x?: number) => 1 : (x?: number) => number
@@ -71,8 +71,8 @@ var a: () => number;
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (x: number) => 1; // error, too many required params
 >a = (x: number) => 1 : (x: number) => number
@@ -171,8 +171,8 @@ var a2: (x?: number) => number;
 >   : ^ ^^^      ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x?: number) => 1; // ok, same number of required params
 >a2 = (x?: number) => 1 : (x?: number) => number
@@ -183,8 +183,8 @@ var a2: (x?: number) => number;
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x: number) => 1; // ok, same number of params
 >a2 = (x: number) => 1 : (x: number) => number
@@ -195,8 +195,8 @@ var a2: (x?: number) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = b.a; // ok
 >a2 = b.a : () => number
@@ -283,8 +283,8 @@ var a3: (x: number) => number;
 >   : ^ ^^      ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x?: number) => 1; // ok, fewer required params
 >a3 = (x?: number) => 1 : (x?: number) => number
@@ -295,8 +295,8 @@ var a3: (x: number) => number;
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: number) => 1; // ok, same number of required params
 >a3 = (x: number) => 1 : (x: number) => number
@@ -307,8 +307,8 @@ var a3: (x: number) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: number, y: number) => 1;  // error, too many required params
 >a3 = (x: number, y: number) => 1 : (x: number, y: number) => number
@@ -411,8 +411,8 @@ var a4: (x: number, y?: number) => number;
 >   : ^ ^^      ^^ ^^^      ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x?: number, y?: number) => 1; // ok, fewer required params
 >a4 = (x?: number, y?: number) => 1 : (x?: number, y?: number) => number
@@ -425,8 +425,8 @@ var a4: (x: number, y?: number) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x: number) => 1; // ok, same number of required params
 >a4 = (x: number) => 1 : (x: number) => number
@@ -437,8 +437,8 @@ var a4: (x: number, y?: number) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x: number, y: number) => 1; // ok, same number of params
 >a4 = (x: number, y: number) => 1 : (x: number, y: number) => number
@@ -451,8 +451,8 @@ var a4: (x: number, y?: number) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = b.a; // ok
 >a4 = b.a : () => number
@@ -541,8 +541,8 @@ var a5: (x?: number, y?: number) => number;
 >   : ^ ^^^      ^^ ^^^      ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a5 = (x?: number, y?: number) => 1; // ok, fewer required params
 >a5 = (x?: number, y?: number) => 1 : (x?: number, y?: number) => number
@@ -555,8 +555,8 @@ var a5: (x?: number, y?: number) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a5 = (x: number) => 1; // ok, fewer params in lambda
 >a5 = (x: number) => 1 : (x: number) => number
@@ -567,8 +567,8 @@ var a5: (x?: number, y?: number) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a5 = (x: number, y: number) => 1;  // ok, same number of params
 >a5 = (x: number, y: number) => 1 : (x: number, y: number) => number
@@ -581,8 +581,8 @@ var a5: (x?: number, y?: number) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a5 = b.a; // ok
 >a5 = b.a : () => number
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types
index cf1ad52287e..8dcf803b0f3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types
@@ -52,8 +52,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >  : ^^^^    ^^        ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (...args: number[]) => 1; // ok, same number of required params
 >a = (...args: number[]) => 1 : (...args: number[]) => number
@@ -64,8 +64,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >                         : ^^^^    ^^        ^^^^^^^^^^^
 >args : number[]
 >     : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (...args: string[]) => 1; // error, type mismatch
 >a = (...args: string[]) => 1 : (...args: string[]) => number
@@ -76,8 +76,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >                         : ^^^^    ^^        ^^^^^^^^^^^
 >args : string[]
 >     : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (x?: number) => 1; // ok, same number of required params
 >a = (x?: number) => 1 : (x?: number) => number
@@ -88,8 +88,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (x?: number, y?: number, z?: number) => 1; // ok, same number of required params
 >a = (x?: number, y?: number, z?: number) => 1 : (x?: number, y?: number, z?: number) => number
@@ -104,8 +104,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >  : ^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (x: number) => 1; // ok, rest param corresponds to infinite number of params
 >a = (x: number) => 1 : (x: number) => number
@@ -116,8 +116,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = (x?: string) => 1; // error, incompatible type
 >a = (x?: string) => 1 : (x?: string) => number
@@ -128,8 +128,8 @@ var a: (...args: number[]) => number; // ok, same number of required params
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
 var a2: (x: number, ...z: number[]) => number;
@@ -147,8 +147,8 @@ var a2: (x: number, ...z: number[]) => number;
 >   : ^ ^^      ^^^^^ ^^        ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (...args: number[]) => 1; // ok, fewer required params
 >a2 = (...args: number[]) => 1 : (...args: number[]) => number
@@ -159,8 +159,8 @@ var a2: (x: number, ...z: number[]) => number;
 >                         : ^^^^    ^^        ^^^^^^^^^^^
 >args : number[]
 >     : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x?: number) => 1; // ok, fewer required params
 >a2 = (x?: number) => 1 : (x?: number) => number
@@ -171,8 +171,8 @@ var a2: (x: number, ...z: number[]) => number;
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x: number) => 1; // ok, same number of required params
 >a2 = (x: number) => 1 : (x: number) => number
@@ -183,8 +183,8 @@ var a2: (x: number, ...z: number[]) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x: number, ...args: number[]) => 1; // ok, same number of required params
 >a2 = (x: number, ...args: number[]) => 1 : (x: number, ...args: number[]) => number
@@ -197,8 +197,8 @@ var a2: (x: number, ...z: number[]) => number;
 >  : ^^^^^^
 >args : number[]
 >     : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x: number, ...args: string[]) => 1; // should be type mismatch error
 >a2 = (x: number, ...args: string[]) => 1 : (x: number, ...args: string[]) => number
@@ -211,8 +211,8 @@ var a2: (x: number, ...z: number[]) => number;
 >  : ^^^^^^
 >args : string[]
 >     : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x: number, y: number) => 1; // ok, rest param corresponds to infinite number of params
 >a2 = (x: number, y: number) => 1 : (x: number, y: number) => number
@@ -225,8 +225,8 @@ var a2: (x: number, ...z: number[]) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a2 = (x: number, y?: number) => 1; // ok, same number of required params
 >a2 = (x: number, y?: number) => 1 : (x: number, y?: number) => number
@@ -239,8 +239,8 @@ var a2: (x: number, ...z: number[]) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var a3: (x: number, y?: string, ...z: number[]) => number;
 >a3 : (x: number, y?: string, ...z: number[]) => number
@@ -259,8 +259,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >   : ^ ^^      ^^ ^^^      ^^^^^ ^^        ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x?: number) => 1; // ok, fewer required params
 >a3 = (x?: number) => 1 : (x?: number) => number
@@ -271,8 +271,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >                  : ^ ^^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: number) => 1; // ok, same number of required params
 >a3 = (x: number) => 1 : (x: number) => number
@@ -283,8 +283,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: number, y: string) => 1;  // ok, all present params match
 >a3 = (x: number, y: string) => 1 : (x: number, y: string) => number
@@ -297,8 +297,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >y : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: number, y?: number, z?: number) => 1;  // error
 >a3 = (x: number, y?: number, z?: number) => 1 : (x: number, y?: number, z?: number) => number
@@ -313,8 +313,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: number, ...z: number[]) => 1;  // error
 >a3 = (x: number, ...z: number[]) => 1 : (x: number, ...z: number[]) => number
@@ -327,8 +327,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >z : number[]
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a3 = (x: string, y?: string, z?: string) => 1;  // error
 >a3 = (x: string, y?: string, z?: string) => 1 : (x: string, y?: string, z?: string) => number
@@ -343,8 +343,8 @@ var a3: (x: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >z : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var a4: (x?: number, y?: string, ...z: number[]) => number;
 >a4 : (x?: number, y?: string, ...z: number[]) => number
@@ -363,8 +363,8 @@ var a4: (x?: number, y?: string, ...z: number[]) => number;
 >   : ^ ^^^      ^^ ^^^      ^^^^^ ^^        ^^^^^      
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x?: number, y?: number) => 1; // error, type mismatch
 >a4 = (x?: number, y?: number) => 1 : (x?: number, y?: number) => number
@@ -377,8 +377,8 @@ var a4: (x?: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x: number) => 1; // ok, all present params match
 >a4 = (x: number) => 1 : (x: number) => number
@@ -389,8 +389,8 @@ var a4: (x?: number, y?: string, ...z: number[]) => number;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x: number, y?: number) => 1;  // error, second param has type mismatch
 >a4 = (x: number, y?: number) => 1 : (x: number, y?: number) => number
@@ -403,8 +403,8 @@ var a4: (x?: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x?: number, y?: string) => 1;  // ok, same number of required params with matching types
 >a4 = (x?: number, y?: string) => 1 : (x?: number, y?: string) => number
@@ -417,8 +417,8 @@ var a4: (x?: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >y : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a4 = (x: number, ...args: string[]) => 1;  // error, rest params have type mismatch
 >a4 = (x: number, ...args: string[]) => 1 : (x: number, ...args: string[]) => number
@@ -431,6 +431,6 @@ var a4: (x?: number, y?: string, ...z: number[]) => number;
 >  : ^^^^^^
 >args : string[]
 >     : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types
index aa0e4a1a744..be6617683be 100644
--- a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types
+++ b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types
@@ -381,8 +381,8 @@ namespace GH14865 {
 >    : ^^^
 >data : string
 >     : ^^^^^^
->"whatevs" : string
->          : ^^^^^^
+>"whatevs" : "whatevs"
+>          : ^^^^^^^^^
 
     let b: Style1;
 >b : Style1
@@ -713,14 +713,14 @@ namespace GH39357 {
 >       : ^^^^^^^^^^^^^^^^^^^
 >b : "a" | "b"
 >  : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >["c", ""] : ["c", string]
 >          : ^^^^^^^^^^^^^
 >"c" : "c"
 >    : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 // https://github.com/microsoft/TypeScript/issues/58603
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers3.types b/tests/baselines/reference/assignmentCompatWithObjectMembers3.types
index 3ece9e7d0ba..bb79deec897 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers3.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers3.types
@@ -67,8 +67,8 @@ var a2: S2 = { foo: '' };
 >            : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var b2: T2 = { foo: '' };
 >b2 : T2
@@ -77,8 +77,8 @@ var b2: T2 = { foo: '' };
 >            : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 s = t;
 >s = t : T
diff --git a/tests/baselines/reference/assignmentCompatability1.types b/tests/baselines/reference/assignmentCompatability1.types
index e6e201bf077..f94f26c52c0 100644
--- a/tests/baselines/reference/assignmentCompatability1.types
+++ b/tests/baselines/reference/assignmentCompatability1.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability10.types b/tests/baselines/reference/assignmentCompatability10.types
index 9d437712738..6763bf77049 100644
--- a/tests/baselines/reference/assignmentCompatability10.types
+++ b/tests/baselines/reference/assignmentCompatability10.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -42,8 +42,8 @@ module __test2__ {
 >                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classWithPublicAndOptional : typeof classWithPublicAndOptional
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__x4 = x4;
 >__val__x4 : classWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability11.types b/tests/baselines/reference/assignmentCompatability11.types
index 17596b6a4d0..d42af43b41c 100644
--- a/tests/baselines/reference/assignmentCompatability11.types
+++ b/tests/baselines/reference/assignmentCompatability11.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability12.types b/tests/baselines/reference/assignmentCompatability12.types
index 67a000b6028..63247587df0 100644
--- a/tests/baselines/reference/assignmentCompatability12.types
+++ b/tests/baselines/reference/assignmentCompatability12.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability13.types b/tests/baselines/reference/assignmentCompatability13.types
index b0ed98a412e..80565d89114 100644
--- a/tests/baselines/reference/assignmentCompatability13.types
+++ b/tests/baselines/reference/assignmentCompatability13.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability14.types b/tests/baselines/reference/assignmentCompatability14.types
index 2e0ef37c46d..8c23f7d587b 100644
--- a/tests/baselines/reference/assignmentCompatability14.types
+++ b/tests/baselines/reference/assignmentCompatability14.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability15.types b/tests/baselines/reference/assignmentCompatability15.types
index 4e42c8376f2..0c5fbff2361 100644
--- a/tests/baselines/reference/assignmentCompatability15.types
+++ b/tests/baselines/reference/assignmentCompatability15.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability16.types b/tests/baselines/reference/assignmentCompatability16.types
index 0d4ecb639e6..57c13f369a2 100644
--- a/tests/baselines/reference/assignmentCompatability16.types
+++ b/tests/baselines/reference/assignmentCompatability16.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability17.types b/tests/baselines/reference/assignmentCompatability17.types
index 1fe3b4d64cc..2a4887eb49c 100644
--- a/tests/baselines/reference/assignmentCompatability17.types
+++ b/tests/baselines/reference/assignmentCompatability17.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability18.types b/tests/baselines/reference/assignmentCompatability18.types
index fadeaa7d7f9..13c5ecc99a1 100644
--- a/tests/baselines/reference/assignmentCompatability18.types
+++ b/tests/baselines/reference/assignmentCompatability18.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability19.types b/tests/baselines/reference/assignmentCompatability19.types
index bfc81609e77..99952b4b501 100644
--- a/tests/baselines/reference/assignmentCompatability19.types
+++ b/tests/baselines/reference/assignmentCompatability19.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability2.types b/tests/baselines/reference/assignmentCompatability2.types
index 3c085038a3a..f35cbfccb0d 100644
--- a/tests/baselines/reference/assignmentCompatability2.types
+++ b/tests/baselines/reference/assignmentCompatability2.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability20.types b/tests/baselines/reference/assignmentCompatability20.types
index 7785dca4099..1d9be3931ef 100644
--- a/tests/baselines/reference/assignmentCompatability20.types
+++ b/tests/baselines/reference/assignmentCompatability20.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability21.types b/tests/baselines/reference/assignmentCompatability21.types
index b361687ffa7..bf75ed95096 100644
--- a/tests/baselines/reference/assignmentCompatability21.types
+++ b/tests/baselines/reference/assignmentCompatability21.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability22.types b/tests/baselines/reference/assignmentCompatability22.types
index c5c24baa276..97858c30b7c 100644
--- a/tests/baselines/reference/assignmentCompatability22.types
+++ b/tests/baselines/reference/assignmentCompatability22.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability23.types b/tests/baselines/reference/assignmentCompatability23.types
index 6ee854998dd..0bb44a107fc 100644
--- a/tests/baselines/reference/assignmentCompatability23.types
+++ b/tests/baselines/reference/assignmentCompatability23.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability24.types b/tests/baselines/reference/assignmentCompatability24.types
index 966a65b69c3..4e964a3a6df 100644
--- a/tests/baselines/reference/assignmentCompatability24.types
+++ b/tests/baselines/reference/assignmentCompatability24.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability25.types b/tests/baselines/reference/assignmentCompatability25.types
index a074134776c..260d0de3586 100644
--- a/tests/baselines/reference/assignmentCompatability25.types
+++ b/tests/baselines/reference/assignmentCompatability25.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability26.types b/tests/baselines/reference/assignmentCompatability26.types
index b06f8875c54..a8b9af810d7 100644
--- a/tests/baselines/reference/assignmentCompatability26.types
+++ b/tests/baselines/reference/assignmentCompatability26.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability27.types b/tests/baselines/reference/assignmentCompatability27.types
index 79dc17e5391..650081348d5 100644
--- a/tests/baselines/reference/assignmentCompatability27.types
+++ b/tests/baselines/reference/assignmentCompatability27.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability28.types b/tests/baselines/reference/assignmentCompatability28.types
index e740c55e52e..28ffa9e1900 100644
--- a/tests/baselines/reference/assignmentCompatability28.types
+++ b/tests/baselines/reference/assignmentCompatability28.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability29.types b/tests/baselines/reference/assignmentCompatability29.types
index feecf8d3f22..00b31667416 100644
--- a/tests/baselines/reference/assignmentCompatability29.types
+++ b/tests/baselines/reference/assignmentCompatability29.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability3.types b/tests/baselines/reference/assignmentCompatability3.types
index 7c98be4acef..33a79744841 100644
--- a/tests/baselines/reference/assignmentCompatability3.types
+++ b/tests/baselines/reference/assignmentCompatability3.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability30.types b/tests/baselines/reference/assignmentCompatability30.types
index d2cf3864eda..bb9795b0b9b 100644
--- a/tests/baselines/reference/assignmentCompatability30.types
+++ b/tests/baselines/reference/assignmentCompatability30.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability31.types b/tests/baselines/reference/assignmentCompatability31.types
index 5ca3af22857..a9eb60e83b5 100644
--- a/tests/baselines/reference/assignmentCompatability31.types
+++ b/tests/baselines/reference/assignmentCompatability31.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability32.types b/tests/baselines/reference/assignmentCompatability32.types
index 7c2384d3bed..69b6e1cab8f 100644
--- a/tests/baselines/reference/assignmentCompatability32.types
+++ b/tests/baselines/reference/assignmentCompatability32.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability33.types b/tests/baselines/reference/assignmentCompatability33.types
index 3e558cfe2b4..216500a14ba 100644
--- a/tests/baselines/reference/assignmentCompatability33.types
+++ b/tests/baselines/reference/assignmentCompatability33.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability34.types b/tests/baselines/reference/assignmentCompatability34.types
index e6effa60a2c..874597fae32 100644
--- a/tests/baselines/reference/assignmentCompatability34.types
+++ b/tests/baselines/reference/assignmentCompatability34.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability35.types b/tests/baselines/reference/assignmentCompatability35.types
index 91dfebcf483..ab25e79b1fc 100644
--- a/tests/baselines/reference/assignmentCompatability35.types
+++ b/tests/baselines/reference/assignmentCompatability35.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability36.types b/tests/baselines/reference/assignmentCompatability36.types
index 02759e6d368..0e27341b17c 100644
--- a/tests/baselines/reference/assignmentCompatability36.types
+++ b/tests/baselines/reference/assignmentCompatability36.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability37.types b/tests/baselines/reference/assignmentCompatability37.types
index 017432c488e..7b765f2c7a5 100644
--- a/tests/baselines/reference/assignmentCompatability37.types
+++ b/tests/baselines/reference/assignmentCompatability37.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability38.types b/tests/baselines/reference/assignmentCompatability38.types
index 25dc906b32f..1f31f968295 100644
--- a/tests/baselines/reference/assignmentCompatability38.types
+++ b/tests/baselines/reference/assignmentCompatability38.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability39.types b/tests/baselines/reference/assignmentCompatability39.types
index cbab828a335..c7229cb8ba0 100644
--- a/tests/baselines/reference/assignmentCompatability39.types
+++ b/tests/baselines/reference/assignmentCompatability39.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -42,10 +42,10 @@ module __test2__ {
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classWithTwoPublic : typeof classWithTwoPublic
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"a" : "a"
+>    : ^^^
 
     export var __val__x2 = x2;
 >__val__x2 : classWithTwoPublic<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability4.types b/tests/baselines/reference/assignmentCompatability4.types
index 367f14bc8f2..0259d4f5aaa 100644
--- a/tests/baselines/reference/assignmentCompatability4.types
+++ b/tests/baselines/reference/assignmentCompatability4.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability40.types b/tests/baselines/reference/assignmentCompatability40.types
index f018db9b513..0deb2c65568 100644
--- a/tests/baselines/reference/assignmentCompatability40.types
+++ b/tests/baselines/reference/assignmentCompatability40.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -40,8 +40,8 @@ module __test2__ {
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^
 >classWithPrivate : typeof classWithPrivate
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__x5 = x5;
 >__val__x5 : classWithPrivate<number>
diff --git a/tests/baselines/reference/assignmentCompatability41.types b/tests/baselines/reference/assignmentCompatability41.types
index de2d96c8993..c01158ad1a3 100644
--- a/tests/baselines/reference/assignmentCompatability41.types
+++ b/tests/baselines/reference/assignmentCompatability41.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -42,10 +42,10 @@ module __test2__ {
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classWithTwoPrivate : typeof classWithTwoPrivate
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"a" : "a"
+>    : ^^^
 
     export var __val__x6 = x6;
 >__val__x6 : classWithTwoPrivate<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability42.types b/tests/baselines/reference/assignmentCompatability42.types
index 6af9d777bd9..bd3efc5b968 100644
--- a/tests/baselines/reference/assignmentCompatability42.types
+++ b/tests/baselines/reference/assignmentCompatability42.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -42,10 +42,10 @@ module __test2__ {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classWithPublicPrivate : typeof classWithPublicPrivate
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"a" : "a"
+>    : ^^^
 
     export var __val__x7 = x7;
 >__val__x7 : classWithPublicPrivate<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability43.types b/tests/baselines/reference/assignmentCompatability43.types
index 3a9996a20a3..cc449ba6aa8 100644
--- a/tests/baselines/reference/assignmentCompatability43.types
+++ b/tests/baselines/reference/assignmentCompatability43.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -40,12 +40,12 @@ module __test2__ {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >two : string
 >    : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
     export var __val__obj2 = obj2;
 >__val__obj2 : interfaceTwo<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability46.types b/tests/baselines/reference/assignmentCompatability46.types
index 8628d8d98e2..a7ed8abede5 100644
--- a/tests/baselines/reference/assignmentCompatability46.types
+++ b/tests/baselines/reference/assignmentCompatability46.types
@@ -14,12 +14,12 @@ fn([1, 2, 3])
 >   : ^ ^^     ^^^^^    
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 fn({ a: 1, b: 2 })
 >fn({ a: 1, b: 2 }) : void
@@ -30,10 +30,10 @@ fn({ a: 1, b: 2 })
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatability5.types b/tests/baselines/reference/assignmentCompatability5.types
index 5a466d54b1a..673b41dbfd4 100644
--- a/tests/baselines/reference/assignmentCompatability5.types
+++ b/tests/baselines/reference/assignmentCompatability5.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -38,8 +38,8 @@ module __test2__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj1 = obj1;
 >__val__obj1 : interfaceOne<number>
diff --git a/tests/baselines/reference/assignmentCompatability6.types b/tests/baselines/reference/assignmentCompatability6.types
index 443d3f7bb38..5b773aaec63 100644
--- a/tests/baselines/reference/assignmentCompatability6.types
+++ b/tests/baselines/reference/assignmentCompatability6.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability7.types b/tests/baselines/reference/assignmentCompatability7.types
index 2c2bb1a13a5..308d8da9bb6 100644
--- a/tests/baselines/reference/assignmentCompatability7.types
+++ b/tests/baselines/reference/assignmentCompatability7.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -40,8 +40,8 @@ module __test2__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentCompatability8.types b/tests/baselines/reference/assignmentCompatability8.types
index 74e20fe6792..5995c8b4ad1 100644
--- a/tests/baselines/reference/assignmentCompatability8.types
+++ b/tests/baselines/reference/assignmentCompatability8.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
@@ -40,8 +40,8 @@ module __test2__ {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^
 >classWithPublic : typeof classWithPublic
 >                : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__x1 = x1;
 >__val__x1 : classWithPublic<number>
diff --git a/tests/baselines/reference/assignmentCompatability9.types b/tests/baselines/reference/assignmentCompatability9.types
index e16056b699f..d09d4151efc 100644
--- a/tests/baselines/reference/assignmentCompatability9.types
+++ b/tests/baselines/reference/assignmentCompatability9.types
@@ -16,8 +16,8 @@ module __test1__ {
 >           : ^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     export var __val__obj4 = obj4;
 >__val__obj4 : interfaceWithPublicAndOptional<number, string>
diff --git a/tests/baselines/reference/assignmentGenericLookupTypeNarrowing.types b/tests/baselines/reference/assignmentGenericLookupTypeNarrowing.types
index e2e22db2cef..de7504bed4c 100644
--- a/tests/baselines/reference/assignmentGenericLookupTypeNarrowing.types
+++ b/tests/baselines/reference/assignmentGenericLookupTypeNarrowing.types
@@ -16,8 +16,8 @@ let mappedObject: {[K in "foo"]: null | {x: string}} = {foo: {x: "hello"}};
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 declare function foo<T>(x: T): null | T;
 >foo : <T>(x: T) => null | T
diff --git a/tests/baselines/reference/assignmentIndexedToPrimitives.types b/tests/baselines/reference/assignmentIndexedToPrimitives.types
index eb6f98540fd..6e8a9b66312 100644
--- a/tests/baselines/reference/assignmentIndexedToPrimitives.types
+++ b/tests/baselines/reference/assignmentIndexedToPrimitives.types
@@ -40,36 +40,36 @@ const s1: string = [0];
 >   : ^^^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const s2: string = ["0"];
 >s2 : string
 >   : ^^^^^^
 >["0"] : string[]
 >      : ^^^^^^^^
->"0" : string
->    : ^^^^^^
+>"0" : "0"
+>    : ^^^
 
 const s3: string = [0, "1"];
 >s3 : string
 >   : ^^^^^^
 >[0, "1"] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->"1" : string
->    : ^^^^^^
+>0 : 0
+>  : ^
+>"1" : "1"
+>    : ^^^
 
 const s4: "01" = ["0", "1"];
 >s4 : "01"
 >   : ^^^^
 >["0", "1"] : string[]
 >           : ^^^^^^^^
->"0" : string
->    : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"0" : "0"
+>    : ^^^
+>"1" : "1"
+>    : ^^^
 
 const no1: number = { 0: 1 };
 >no1 : number
@@ -88,8 +88,8 @@ const so1: string = { 0: 1 };
 >         : ^^^^^^^^^^^^^^
 >0 : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const so2: string = { "0": 1 };
 >so2 : string
@@ -98,8 +98,8 @@ const so2: string = { "0": 1 };
 >           : ^^^^^^^^^^^^^^^^
 >"0" : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const so3: string = { 0: "1" };
 >so3 : string
@@ -108,6 +108,6 @@ const so3: string = { 0: "1" };
 >           : ^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
diff --git a/tests/baselines/reference/assignmentStricterConstraints.types b/tests/baselines/reference/assignmentStricterConstraints.types
index efaf87a2b25..4307744b8b0 100644
--- a/tests/baselines/reference/assignmentStricterConstraints.types
+++ b/tests/baselines/reference/assignmentStricterConstraints.types
@@ -43,8 +43,8 @@ g(1, "")
 >         : ^^^^
 >g : <T, S>(x: T, y: S) => void
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^    
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.types b/tests/baselines/reference/assignmentToObjectAndFunction.types
index 53f399adcab..9cf7639218e 100644
--- a/tests/baselines/reference/assignmentToObjectAndFunction.types
+++ b/tests/baselines/reference/assignmentToObjectAndFunction.types
@@ -24,8 +24,8 @@ var goodObj: Object = {
 >  : ^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 }; // Ok, because toString is a subtype of Object's toString
 
diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types
index 8c87301d74a..b40c45bd442 100644
--- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types
+++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types
@@ -6,40 +6,40 @@ var x: number;
 >  : ^^^^^^
 
 x = 3; // OK
->x = 3 : number
->      : ^^^^^^
+>x = 3 : 3
+>      : ^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 (x) = 3; // OK
->(x) = 3 : number
->        : ^^^^^^
+>(x) = 3 : 3
+>        : ^
 >(x) : number
 >    : ^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 x = ''; // Error
->x = '' : string
->       : ^^^^^^
+>x = '' : ""
+>       : ^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 (x) = ''; // Error
->(x) = '' : string
->         : ^^^^^^
+>(x) = '' : ""
+>         : ^^
 >(x) : number
 >    : ^^^^^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 module M {
 >M : typeof M
@@ -50,20 +50,20 @@ module M {
 >  : ^^^^^^
 }
 M.y = 3; // OK
->M.y = 3 : number
->        : ^^^^^^
+>M.y = 3 : 3
+>        : ^
 >M.y : number
 >    : ^^^^^^
 >M : typeof M
 >  : ^^^^^^^^
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 (M).y = 3; // OK
->(M).y = 3 : number
->          : ^^^^^^
+>(M).y = 3 : 3
+>          : ^
 >(M).y : number
 >      : ^^^^^^
 >(M) : typeof M
@@ -72,12 +72,12 @@ M.y = 3; // OK
 >  : ^^^^^^^^
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 (M.y) = 3; // OK
->(M.y) = 3 : number
->          : ^^^^^^
+>(M.y) = 3 : 3
+>          : ^
 >(M.y) : number
 >      : ^^^^^^
 >M.y : number
@@ -86,24 +86,24 @@ M.y = 3; // OK
 >  : ^^^^^^^^
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 M.y = ''; // Error
->M.y = '' : string
->         : ^^^^^^
+>M.y = '' : ""
+>         : ^^
 >M.y : number
 >    : ^^^^^^
 >M : typeof M
 >  : ^^^^^^^^
 >y : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 (M).y = ''; // Error
->(M).y = '' : string
->           : ^^^^^^
+>(M).y = '' : ""
+>           : ^^
 >(M).y : number
 >      : ^^^^^^
 >(M) : typeof M
@@ -112,12 +112,12 @@ M.y = ''; // Error
 >  : ^^^^^^^^
 >y : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 (M.y) = ''; // Error
->(M.y) = '' : string
->           : ^^^^^^
+>(M.y) = '' : ""
+>           : ^^
 >(M.y) : number
 >      : ^^^^^^
 >M.y : number
@@ -126,8 +126,8 @@ M.y = ''; // Error
 >  : ^^^^^^^^
 >y : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 M = { y: 3 }; // Error
 >M = { y: 3 } : { y: number; }
@@ -193,8 +193,8 @@ M2.M3 = { x: 3 }; // OK
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 (M2).M3 = { x: 3 }; // OK
 >(M2).M3 = { x: 3 } : { x: number; }
@@ -211,8 +211,8 @@ M2.M3 = { x: 3 }; // OK
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 (M2.M3) = { x: 3 }; // OK
 >(M2.M3) = { x: 3 } : { x: number; }
@@ -229,8 +229,8 @@ M2.M3 = { x: 3 }; // OK
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 M2.M3 = { x: '' }; // Error
 >M2.M3 = { x: '' } : { x: string; }
@@ -245,8 +245,8 @@ M2.M3 = { x: '' }; // Error
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 (M2).M3 = { x: '' }; // Error
 >(M2).M3 = { x: '' } : { x: string; }
@@ -263,8 +263,8 @@ M2.M3 = { x: '' }; // Error
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 (M2.M3) = { x: '' }; // Error
 >(M2.M3) = { x: '' } : { x: string; }
@@ -281,8 +281,8 @@ M2.M3 = { x: '' }; // Error
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 
 function fn() { }
@@ -322,44 +322,44 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^^
 
     x = 3;
->x = 3 : number
->      : ^^^^^^
+>x = 3 : 3
+>      : ^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     (x) = 3; // OK
->(x) = 3 : number
->        : ^^^^^^
+>(x) = 3 : 3
+>        : ^
 >(x) : number
 >    : ^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     x = ''; // Error
->x = '' : string
->       : ^^^^^^
+>x = '' : ""
+>       : ^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     (x) = ''; // Error
->(x) = '' : string
->         : ^^^^^^
+>(x) = '' : ""
+>         : ^^
 >(x) : number
 >    : ^^^^^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     (y).t = 3; // OK
->(y).t = 3 : number
->          : ^^^^^^
+>(y).t = 3 : 3
+>          : ^
 >(y).t : number
 >      : ^^^^^^
 >(y) : { t: number; }
@@ -368,12 +368,12 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >t : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     (y.t) = 3; // OK
->(y.t) = 3 : number
->          : ^^^^^^
+>(y.t) = 3 : 3
+>          : ^
 >(y.t) : number
 >      : ^^^^^^
 >y.t : number
@@ -382,12 +382,12 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >t : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     (y).t = ''; // Error
->(y).t = '' : string
->           : ^^^^^^
+>(y).t = '' : ""
+>           : ^^
 >(y).t : number
 >      : ^^^^^^
 >(y) : { t: number; }
@@ -396,12 +396,12 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >t : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     (y.t) = ''; // Error
->(y.t) = '' : string
->           : ^^^^^^
+>(y.t) = '' : ""
+>           : ^^
 >(y.t) : number
 >      : ^^^^^^
 >y.t : number
@@ -410,24 +410,24 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >t : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     y['t'] = 3; // OK
->y['t'] = 3 : number
->           : ^^^^^^
+>y['t'] = 3 : 3
+>           : ^
 >y['t'] : number
 >       : ^^^^^^
 >y : { t: number; }
 >  : ^^^^^      ^^^
 >'t' : "t"
 >    : ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     (y)['t'] = 3; // OK
->(y)['t'] = 3 : number
->             : ^^^^^^
+>(y)['t'] = 3 : 3
+>             : ^
 >(y)['t'] : number
 >         : ^^^^^^
 >(y) : { t: number; }
@@ -436,12 +436,12 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >'t' : "t"
 >    : ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     (y['t']) = 3; // OK
->(y['t']) = 3 : number
->             : ^^^^^^
+>(y['t']) = 3 : 3
+>             : ^
 >(y['t']) : number
 >         : ^^^^^^
 >y['t'] : number
@@ -450,24 +450,24 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >'t' : "t"
 >    : ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     y['t'] = ''; // Error
->y['t'] = '' : string
->            : ^^^^^^
+>y['t'] = '' : ""
+>            : ^^
 >y['t'] : number
 >       : ^^^^^^
 >y : { t: number; }
 >  : ^^^^^      ^^^
 >'t' : "t"
 >    : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     (y)['t'] = ''; // Error
->(y)['t'] = '' : string
->              : ^^^^^^
+>(y)['t'] = '' : ""
+>              : ^^
 >(y)['t'] : number
 >         : ^^^^^^
 >(y) : { t: number; }
@@ -476,12 +476,12 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >'t' : "t"
 >    : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     (y['t']) = ''; // Error
->(y['t']) = '' : string
->              : ^^^^^^
+>(y['t']) = '' : ""
+>              : ^^
 >(y['t']) : number
 >         : ^^^^^^
 >y['t'] : number
@@ -490,8 +490,8 @@ function fn2(x: number, y: { t: number }) {
 >  : ^^^^^      ^^^
 >'t' : "t"
 >    : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 enum E {
diff --git a/tests/baselines/reference/assignmentTypeNarrowing.types b/tests/baselines/reference/assignmentTypeNarrowing.types
index eb9fa5fb64b..b4105c63615 100644
--- a/tests/baselines/reference/assignmentTypeNarrowing.types
+++ b/tests/baselines/reference/assignmentTypeNarrowing.types
@@ -46,8 +46,8 @@ x; // boolean
 >   : ^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x; // string | number
 >x : string | number
diff --git a/tests/baselines/reference/asyncArrowFunction_allowJs.types b/tests/baselines/reference/asyncArrowFunction_allowJs.types
index 4141efd7cbd..99e2cb63575 100644
--- a/tests/baselines/reference/asyncArrowFunction_allowJs.types
+++ b/tests/baselines/reference/asyncArrowFunction_allowJs.types
@@ -8,8 +8,8 @@ const a = () => 0
 >  : ^^^^^^      
 >() => 0 : () => string
 >        : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // Error (good)
 /** @type {function(): string} */
diff --git a/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.types b/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.types
index ee964decf06..0ba2172e554 100644
--- a/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.types
+++ b/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.types
@@ -51,8 +51,8 @@ async function asyncFoo(): Promise<Foo> {
                     thing: 1
 >thing : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
                 }
             }
         }
diff --git a/tests/baselines/reference/asyncFunctionReturnType.types b/tests/baselines/reference/asyncFunctionReturnType.types
index c0462cd2a10..0ffaf33a7a3 100644
--- a/tests/baselines/reference/asyncFunctionReturnType.types
+++ b/tests/baselines/reference/asyncFunctionReturnType.types
@@ -23,8 +23,8 @@ async function fAsyncExplicit(): Promise<[number, boolean]> {
     return [1, true];
 >[1, true] : [number, true]
 >          : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 }
diff --git a/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.types b/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.types
index 236e9c0ad85..3312a2e488d 100644
--- a/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.types
+++ b/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.types
@@ -48,12 +48,12 @@ async function test2() {
 >   : ^^
 
     for (i = 1; i < limit; ++i) {
->i = 1 : number
->      : ^^^^^^
+>i = 1 : 1
+>      : ^
 >i : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >i < limit : boolean
 >          : ^^^^^^^
 >i : number
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.types b/tests/baselines/reference/asyncMethodWithSuper_es6.types
index f775c04fd68..e398fc907f0 100644
--- a/tests/baselines/reference/asyncMethodWithSuper_es6.types
+++ b/tests/baselines/reference/asyncMethodWithSuper_es6.types
@@ -861,8 +861,8 @@ class Derived extends Base {
 >      : ^^^^
 >method : (x: string) => any
 >       : ^ ^^      ^^^^^   
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     b() { return async () => super.getter }
 >b : () => () => Promise<any>
@@ -902,8 +902,8 @@ class Derived extends Base {
 >      : ^^^^
 >"method" : "method"
 >         : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     e() { return async () => super["getter"] }
 >e : () => () => Promise<any>
@@ -943,8 +943,8 @@ class Derived extends Base {
 >      : ^^^^^^^^^^^
 >method : (x: string) => any
 >       : ^ ^^      ^^^^^   
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     static b() { return async () => super.getter }
 >b : () => () => Promise<any>
@@ -984,8 +984,8 @@ class Derived extends Base {
 >      : ^^^^^^^^^^^
 >"method" : "method"
 >         : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     static e() { return async () => super["getter"] }
 >e : () => () => Promise<any>
diff --git a/tests/baselines/reference/augmentExportEquals3.types b/tests/baselines/reference/augmentExportEquals3.types
index 0504f3d9a33..32d70fcb514 100644
--- a/tests/baselines/reference/augmentExportEquals3.types
+++ b/tests/baselines/reference/augmentExportEquals3.types
@@ -25,16 +25,16 @@ import x = require("./file1");
 >  : ^^^^^^^^
 
 x.b = 1;
->x.b = 1 : number
->        : ^^^^^^
+>x.b = 1 : 1
+>        : ^
 >x.b : number
 >    : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // OK - './file1' is a namespace
 declare module "./file1" {
diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
index 7ee2a816634..684978016dd 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.types
+++ b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -30,16 +30,16 @@ import x = require("file1");
 >  : ^^^^^^^^
 
 x.b = 1;
->x.b = 1 : number
->        : ^^^^^^
+>x.b = 1 : 1
+>        : ^
 >x.b : number
 >    : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // OK - './file1' is a namespace
 declare module "file1" {
diff --git a/tests/baselines/reference/augmentExportEquals4.types b/tests/baselines/reference/augmentExportEquals4.types
index b645101a0da..acb45a28849 100644
--- a/tests/baselines/reference/augmentExportEquals4.types
+++ b/tests/baselines/reference/augmentExportEquals4.types
@@ -25,16 +25,16 @@ import x = require("./file1");
 >  : ^^^^^^^^
 
 x.b = 1;
->x.b = 1 : number
->        : ^^^^^^
+>x.b = 1 : 1
+>        : ^
 >x.b : number
 >    : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // OK - './file1' is a namespace
 declare module "./file1" {
diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
index feb6f163fa9..fddef2aaacf 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.types
+++ b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -30,16 +30,16 @@ import x = require("file1");
 >  : ^^^^^^^^
 
 x.b = 1;
->x.b = 1 : number
->        : ^^^^^^
+>x.b = 1 : 1
+>        : ^
 >x.b : number
 >    : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // OK - './file1' is a namespace
 declare module "file1" {
diff --git a/tests/baselines/reference/augmentExportEquals6.types b/tests/baselines/reference/augmentExportEquals6.types
index 3a7914d8a3c..e8f21b77c0c 100644
--- a/tests/baselines/reference/augmentExportEquals6.types
+++ b/tests/baselines/reference/augmentExportEquals6.types
@@ -28,8 +28,8 @@ import x = require("./file1");
 >  : ^^^^^^^^
 
 x.B.b = 1;
->x.B.b = 1 : number
->          : ^^^^^^
+>x.B.b = 1 : 1
+>          : ^
 >x.B.b : number
 >      : ^^^^^^
 >x.B : typeof x.B
@@ -40,8 +40,8 @@ x.B.b = 1;
 >  : ^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // OK - './file1' is a namespace
 declare module "./file1" {
diff --git a/tests/baselines/reference/autoAccessor2(target=es2015).types b/tests/baselines/reference/autoAccessor2(target=es2015).types
index 53693af41b3..d3f1cf229ca 100644
--- a/tests/baselines/reference/autoAccessor2(target=es2015).types
+++ b/tests/baselines/reference/autoAccessor2(target=es2015).types
@@ -34,14 +34,14 @@ class C1 {
 >  : ^
 
         this.#b = 4;
->this.#b = 4 : number
->            : ^^^^^^
+>this.#b = 4 : 4
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
     }
 
     static {
@@ -55,14 +55,14 @@ class C1 {
 >  : ^
 
         this.#d = 6;
->this.#d = 6 : number
->            : ^^^^^^
+>this.#d = 6 : 6
+>            : ^
 >this.#d : number
 >        : ^^^^^^
 >this : typeof C1
 >     : ^^^^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/autoAccessor2(target=es2022).types b/tests/baselines/reference/autoAccessor2(target=es2022).types
index 53693af41b3..d3f1cf229ca 100644
--- a/tests/baselines/reference/autoAccessor2(target=es2022).types
+++ b/tests/baselines/reference/autoAccessor2(target=es2022).types
@@ -34,14 +34,14 @@ class C1 {
 >  : ^
 
         this.#b = 4;
->this.#b = 4 : number
->            : ^^^^^^
+>this.#b = 4 : 4
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
     }
 
     static {
@@ -55,14 +55,14 @@ class C1 {
 >  : ^
 
         this.#d = 6;
->this.#d = 6 : number
->            : ^^^^^^
+>this.#d = 6 : 6
+>            : ^
 >this.#d : number
 >        : ^^^^^^
 >this : typeof C1
 >     : ^^^^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/autoAccessor2(target=esnext).types b/tests/baselines/reference/autoAccessor2(target=esnext).types
index 53693af41b3..d3f1cf229ca 100644
--- a/tests/baselines/reference/autoAccessor2(target=esnext).types
+++ b/tests/baselines/reference/autoAccessor2(target=esnext).types
@@ -34,14 +34,14 @@ class C1 {
 >  : ^
 
         this.#b = 4;
->this.#b = 4 : number
->            : ^^^^^^
+>this.#b = 4 : 4
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
     }
 
     static {
@@ -55,14 +55,14 @@ class C1 {
 >  : ^
 
         this.#d = 6;
->this.#d = 6 : number
->            : ^^^^^^
+>this.#d = 6 : 6
+>            : ^
 >this.#d : number
 >        : ^^^^^^
 >this : typeof C1
 >     : ^^^^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/autolift4.types b/tests/baselines/reference/autolift4.types
index 36e29404888..c98161afa48 100644
--- a/tests/baselines/reference/autolift4.types
+++ b/tests/baselines/reference/autolift4.types
@@ -63,10 +63,10 @@ class Point {
 >               : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 }
 
 class Point3D extends Point {
diff --git a/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types
index 8131bd65ba8..d4a3b7edd80 100644
--- a/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types
+++ b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types
@@ -16,8 +16,8 @@ export function test(arg: { index?: number }) {
   const { index = 0 } = arg;
 >index : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >arg : { index?: number; }
 >    : ^^^^^^^^^^      ^^^
 
diff --git a/tests/baselines/reference/awaitCallExpressionInSyncFunction.types b/tests/baselines/reference/awaitCallExpressionInSyncFunction.types
index ea257e05e85..fa988a13c2c 100644
--- a/tests/baselines/reference/awaitCallExpressionInSyncFunction.types
+++ b/tests/baselines/reference/awaitCallExpressionInSyncFunction.types
@@ -20,8 +20,8 @@ function foo() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
    return foo;
 >foo : any
diff --git a/tests/baselines/reference/awaitedType.types b/tests/baselines/reference/awaitedType.types
index 60e5bccb855..a025b532bd4 100644
--- a/tests/baselines/reference/awaitedType.types
+++ b/tests/baselines/reference/awaitedType.types
@@ -722,14 +722,14 @@ async function mainFindMany() {
     select: "foo",
 >select : string
 >       : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
     include: "bar",
 >include : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
   });
   const itsOne = await findManyWrapper({});
@@ -757,8 +757,8 @@ async function mainFindMany() {
 >                  : ^^^^^^^^^^^^^^^^^^^
 >select : string
 >       : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
   const itsTwo2 = await findManyWrapper({ include: "bar" });
 >itsTwo2 : 2
@@ -773,8 +773,8 @@ async function mainFindMany() {
 >                   : ^^^^^^^^^^^^^^^^^^^^
 >include : string
 >        : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 }
 
 // repro from #41831
@@ -795,8 +795,8 @@ async function mainFindMany() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   Promise.all(promises).then((results) => {
 >Promise.all(promises).then((results) => {    const first = results[0]    const second = results[1] // error  }) : Promise<void>
@@ -860,8 +860,8 @@ async function test40330() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     const promiseVoid = async () => {}
 >promiseVoid : () => Promise<void>
diff --git a/tests/baselines/reference/badInferenceLowerPriorityThanGoodInference.types b/tests/baselines/reference/badInferenceLowerPriorityThanGoodInference.types
index 7b3d8082b9d..e7024a67541 100644
--- a/tests/baselines/reference/badInferenceLowerPriorityThanGoodInference.types
+++ b/tests/baselines/reference/badInferenceLowerPriorityThanGoodInference.types
@@ -42,8 +42,8 @@ const result = canYouInferThis(() => ({
 >             : ^^^^^^^^^^^^^^^^^
 >BLAH : number
 >     : ^^^^^^
->33 : number
->   : ^^^^^^
+>33 : 33
+>   : ^^
 
     b: x => { }
 >b : (x: { BLAH: number; }) => void
diff --git a/tests/baselines/reference/baseCheck.types b/tests/baselines/reference/baseCheck.types
index 67f27a8e745..f456444ed3b 100644
--- a/tests/baselines/reference/baseCheck.types
+++ b/tests/baselines/reference/baseCheck.types
@@ -24,8 +24,8 @@ class ELoc extends C {
 >            : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >x : number
 >  : ^^^^^^
     }
@@ -45,8 +45,8 @@ class ELocVar extends C {
 >              : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >loc : any
 >    : ^^^
     }
@@ -92,8 +92,8 @@ class E extends C { constructor(public z: number) { super(0, this.z) } }
 >                 : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.z : number
 >       : ^^^^^^
 >this : this
@@ -112,8 +112,8 @@ class F extends C { constructor(public z: number) { super("hello", this.z) } } /
 >                       : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >this.z : number
 >       : ^^^^^^
 >this : this
diff --git a/tests/baselines/reference/baseClassImprovedMismatchErrors.types b/tests/baselines/reference/baseClassImprovedMismatchErrors.types
index 12f07e158ab..47368d01603 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.types
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.types
@@ -35,8 +35,8 @@ class Derived extends Base {
         return 10 as number | string;
 >10 as number | string : string | number
 >                      : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 class DerivedInterface implements Base {
@@ -54,7 +54,7 @@ class DerivedInterface implements Base {
         return 10 as number | string;
 >10 as number | string : string | number
 >                      : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple.types b/tests/baselines/reference/bestCommonTypeOfTuple.types
index d7f795ddc47..03f342439fe 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple.types
+++ b/tests/baselines/reference/bestCommonTypeOfTuple.types
@@ -6,16 +6,16 @@ function f1(x: number): string { return "foo"; }
 >   : ^ ^^      ^^^^^      
 >x : number
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 function f2(x: number): number { return 10; }
 >f2 : (x: number) => number
 >   : ^ ^^      ^^^^^      
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 function f3(x: number): boolean { return true; }
 >f3 : (x: number) => boolean
@@ -98,8 +98,8 @@ t3 = [5, undefined];
 >   : ^^^^^^^^^^^^^
 >[5, undefined] : [number, undefined]
 >               : ^^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -122,8 +122,8 @@ t4 = [E1.one, E2.two, 20];
 >   : ^^^^^^^^^
 >two : E2
 >    : ^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 var e1 = t1[2];  // {}
 >e1 : undefined
diff --git a/tests/baselines/reference/betterErrorForAccidentalCall.types b/tests/baselines/reference/betterErrorForAccidentalCall.types
index 27d04076ff7..5b0bdbb0847 100644
--- a/tests/baselines/reference/betterErrorForAccidentalCall.types
+++ b/tests/baselines/reference/betterErrorForAccidentalCall.types
@@ -18,8 +18,8 @@ foo()(1 as number).toString();
 >    : ^^^^^^      
 >1 as number : number
 >            : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >toString : any
 >         : ^^^
 
@@ -36,8 +36,8 @@ foo()   (1 as number).toString();
 >    : ^^^^^^      
 >1 as number : number
 >            : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >toString : any
 >         : ^^^
 
@@ -56,8 +56,8 @@ foo()
 (1 as number).toString();
 >1 as number : number
 >            : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >toString : any
 >         : ^^^
 
@@ -98,8 +98,8 @@ foo()
     (<number>1).toString();
 ><number>1 : number
 >          : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >toString : any
 >         : ^^^
 
diff --git a/tests/baselines/reference/bigint64ArraySubarray.types b/tests/baselines/reference/bigint64ArraySubarray.types
index 0a2d2fb6ce6..ab64c3d7efa 100644
--- a/tests/baselines/reference/bigint64ArraySubarray.types
+++ b/tests/baselines/reference/bigint64ArraySubarray.types
@@ -12,8 +12,8 @@ function bigInt64ArraySubarray() {
 >                      : ^^^^^^^^^^^^^
 >BigInt64Array : BigInt64ArrayConstructor
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : BigInt64Array
@@ -34,8 +34,8 @@ function bigInt64ArraySubarray() {
 >    : ^^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => BigInt64Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^             
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : BigInt64Array
@@ -46,9 +46,9 @@ function bigInt64ArraySubarray() {
 >    : ^^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => BigInt64Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^             
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/bigintIndex.types b/tests/baselines/reference/bigintIndex.types
index 01845adac07..16e26728c7c 100644
--- a/tests/baselines/reference/bigintIndex.types
+++ b/tests/baselines/reference/bigintIndex.types
@@ -12,12 +12,12 @@ const arr: number[] = [1, 2, 3];
 >    : ^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 let num: number = arr[1];
 >num : number
@@ -95,8 +95,8 @@ key = 123n; // should error
 const bigNum: bigint = 0n;
 >bigNum : bigint
 >       : ^^^^^^
->0n : bigint
->   : ^^^^^^
+>0n : 0n
+>   : ^^
 
 const typedArray = new Uint8Array(3);
 >typedArray : Uint8Array
@@ -105,8 +105,8 @@ const typedArray = new Uint8Array(3);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 typedArray[bigNum] = 0xAA; // should error
 >typedArray[bigNum] = 0xAA : 170
@@ -137,28 +137,28 @@ typedArray[String(bigNum)] = 0xAA;
 >     : ^^^
 
 typedArray["1"] = 0xBB;
->typedArray["1"] = 0xBB : number
->                       : ^^^^^^
+>typedArray["1"] = 0xBB : 187
+>                       : ^^^
 >typedArray["1"] : number
 >                : ^^^^^^
 >typedArray : Uint8Array
 >           : ^^^^^^^^^^
 >"1" : "1"
 >    : ^^^
->0xBB : number
->     : ^^^^^^
+>0xBB : 187
+>     : ^^^
 
 typedArray[2] = 0xCC;
->typedArray[2] = 0xCC : number
->                     : ^^^^^^
+>typedArray[2] = 0xCC : 204
+>                     : ^^^
 >typedArray[2] : number
 >              : ^^^^^^
 >typedArray : Uint8Array
 >           : ^^^^^^^^^^
 >2 : 2
 >  : ^
->0xCC : number
->     : ^^^^^^
+>0xCC : 204
+>     : ^^^
 
 // {1n: 123} is a syntax error; must go in separate file so BigIntIndex error is shown
 === b.ts ===
diff --git a/tests/baselines/reference/bigintWithLib.types b/tests/baselines/reference/bigintWithLib.types
index 4c48f6be93e..96569a8ac95 100644
--- a/tests/baselines/reference/bigintWithLib.types
+++ b/tests/baselines/reference/bigintWithLib.types
@@ -45,9 +45,9 @@ bigintVal = BigInt.asIntN(8, 0xFFFFn);
 >       : ^^^^^^^^^^^^^^^^^
 >asIntN : (bits: number, int: bigint) => bigint
 >       : ^    ^^      ^^   ^^      ^^^^^      
->8 : number
->  : ^^^^^^
->0xFFFFn : bigint
+>8 : 8
+>  : ^
+>0xFFFFn : 65535n
 >        : ^^^^^^
 
 bigintVal = BigInt.asUintN(8, 0xFFFFn);
@@ -63,9 +63,9 @@ bigintVal = BigInt.asUintN(8, 0xFFFFn);
 >       : ^^^^^^^^^^^^^^^^^
 >asUintN : (bits: number, int: bigint) => bigint
 >        : ^    ^^      ^^   ^^      ^^^^^      
->8 : number
->  : ^^^^^^
->0xFFFFn : bigint
+>8 : 8
+>  : ^
+>0xFFFFn : 65535n
 >        : ^^^^^^
 
 bigintVal = bigintVal.valueOf();
@@ -107,8 +107,8 @@ stringVal = bigintVal.toString(2);
 >          : ^^^^^^
 >toString : (radix?: number) => string
 >         : ^     ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 stringVal = bigintVal.toLocaleString();
 >stringVal = bigintVal.toLocaleString() : string
@@ -159,8 +159,8 @@ stringVal = bigintVal.toLocaleString('de-DE', { style: 'currency' });
 >                      : ^^^^^^^^^^^^^^^^^^
 >style : string
 >      : ^^^^^^
->'currency' : string
->           : ^^^^^^
+>'currency' : "currency"
+>           : ^^^^^^^^^^
 
 stringVal = bigintVal.toLocaleString('de-DE', { style: 'currency', currency: 'EUR' })
 >stringVal = bigintVal.toLocaleString('de-DE', { style: 'currency', currency: 'EUR' }) : string
@@ -181,12 +181,12 @@ stringVal = bigintVal.toLocaleString('de-DE', { style: 'currency', currency: 'EU
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >style : string
 >      : ^^^^^^
->'currency' : string
->           : ^^^^^^
+>'currency' : "currency"
+>           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'EUR' : string
->      : ^^^^^^
+>'EUR' : "EUR"
+>      : ^^^^^
 
 // Test BigInt64Array
 let bigIntArray: BigInt64Array = new BigInt64Array();
@@ -206,8 +206,8 @@ bigIntArray = new BigInt64Array(10);
 >                      : ^^^^^^^^^^^^^
 >BigInt64Array : BigInt64ArrayConstructor
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 bigIntArray = new BigInt64Array([1n, 2n, 3n]);
 >bigIntArray = new BigInt64Array([1n, 2n, 3n]) : BigInt64Array
@@ -220,12 +220,12 @@ bigIntArray = new BigInt64Array([1n, 2n, 3n]);
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1n, 2n, 3n] : bigint[]
 >             : ^^^^^^^^
->1n : bigint
->   : ^^^^^^
->2n : bigint
->   : ^^^^^^
->3n : bigint
->   : ^^^^^^
+>1n : 1n
+>   : ^^
+>2n : 2n
+>   : ^^
+>3n : 3n
+>   : ^^
 
 bigIntArray = new BigInt64Array([1, 2, 3]); // should error
 >bigIntArray = new BigInt64Array([1, 2, 3]) : BigInt64Array
@@ -238,12 +238,12 @@ bigIntArray = new BigInt64Array([1, 2, 3]); // should error
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 bigIntArray = new BigInt64Array(new ArrayBuffer(80));
 >bigIntArray = new BigInt64Array(new ArrayBuffer(80)) : BigInt64Array
@@ -258,8 +258,8 @@ bigIntArray = new BigInt64Array(new ArrayBuffer(80));
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
 bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8);
 >bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8) : BigInt64Array
@@ -274,10 +274,10 @@ bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
->8 : number
->  : ^^^^^^
+>80 : 80
+>   : ^^
+>8 : 8
+>  : ^
 
 bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8, 3);
 >bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8, 3) : BigInt64Array
@@ -292,12 +292,12 @@ bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8, 3);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
->8 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>80 : 80
+>   : ^^
+>8 : 8
+>  : ^
+>3 : 3
+>  : ^
 
 let len: number = bigIntArray.length;
 >len : number
@@ -345,8 +345,8 @@ bigUintArray = new BigUint64Array(10);
 >                       : ^^^^^^^^^^^^^^
 >BigUint64Array : BigUint64ArrayConstructor
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 bigUintArray = new BigUint64Array([1n, 2n, 3n]);
 >bigUintArray = new BigUint64Array([1n, 2n, 3n]) : BigUint64Array
@@ -359,12 +359,12 @@ bigUintArray = new BigUint64Array([1n, 2n, 3n]);
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1n, 2n, 3n] : bigint[]
 >             : ^^^^^^^^
->1n : bigint
->   : ^^^^^^
->2n : bigint
->   : ^^^^^^
->3n : bigint
->   : ^^^^^^
+>1n : 1n
+>   : ^^
+>2n : 2n
+>   : ^^
+>3n : 3n
+>   : ^^
 
 bigUintArray = new BigUint64Array([1, 2, 3]); // should error
 >bigUintArray = new BigUint64Array([1, 2, 3]) : BigUint64Array
@@ -377,12 +377,12 @@ bigUintArray = new BigUint64Array([1, 2, 3]); // should error
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 bigUintArray = new BigUint64Array(new ArrayBuffer(80));
 >bigUintArray = new BigUint64Array(new ArrayBuffer(80)) : BigUint64Array
@@ -397,8 +397,8 @@ bigUintArray = new BigUint64Array(new ArrayBuffer(80));
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
 bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8);
 >bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8) : BigUint64Array
@@ -413,10 +413,10 @@ bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
->8 : number
->  : ^^^^^^
+>80 : 80
+>   : ^^
+>8 : 8
+>  : ^
 
 bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8, 3);
 >bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8, 3) : BigUint64Array
@@ -431,12 +431,12 @@ bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8, 3);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
->8 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>80 : 80
+>   : ^^
+>8 : 8
+>  : ^
+>3 : 3
+>  : ^
 
 len = bigIntArray.length;
 >len = bigIntArray.length : number
@@ -482,8 +482,8 @@ const dataView = new DataView(new ArrayBuffer(80));
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
 dataView.setBigInt64(1, -1n);
 >dataView.setBigInt64(1, -1n) : void
@@ -494,8 +494,8 @@ dataView.setBigInt64(1, -1n);
 >         : ^^^^^^^^
 >setBigInt64 : (byteOffset: number, value: bigint, littleEndian?: boolean) => void
 >            : ^          ^^      ^^     ^^      ^^            ^^^       ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >-1n : -1n
 >    : ^^^
 >1n : 1n
@@ -510,8 +510,8 @@ dataView.setBigInt64(1, -1n, true);
 >         : ^^^^^^^^
 >setBigInt64 : (byteOffset: number, value: bigint, littleEndian?: boolean) => void
 >            : ^          ^^      ^^     ^^      ^^            ^^^       ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >-1n : -1n
 >    : ^^^
 >1n : 1n
@@ -528,8 +528,8 @@ dataView.setBigInt64(1, -1); // should error
 >         : ^^^^^^^^
 >setBigInt64 : (byteOffset: number, value: bigint, littleEndian?: boolean) => void
 >            : ^          ^^      ^^     ^^      ^^            ^^^       ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >-1 : -1
 >   : ^^
 >1 : 1
@@ -544,10 +544,10 @@ dataView.setBigUint64(2, 123n);
 >         : ^^^^^^^^
 >setBigUint64 : (byteOffset: number, value: bigint, littleEndian?: boolean) => void
 >             : ^          ^^      ^^     ^^      ^^            ^^^       ^^^^^    
->2 : number
->  : ^^^^^^
->123n : bigint
->     : ^^^^^^
+>2 : 2
+>  : ^
+>123n : 123n
+>     : ^^^^
 
 dataView.setBigUint64(2, 123n, true);
 >dataView.setBigUint64(2, 123n, true) : void
@@ -558,10 +558,10 @@ dataView.setBigUint64(2, 123n, true);
 >         : ^^^^^^^^
 >setBigUint64 : (byteOffset: number, value: bigint, littleEndian?: boolean) => void
 >             : ^          ^^      ^^     ^^      ^^            ^^^       ^^^^^    
->2 : number
->  : ^^^^^^
->123n : bigint
->     : ^^^^^^
+>2 : 2
+>  : ^
+>123n : 123n
+>     : ^^^^
 >true : true
 >     : ^^^^
 
@@ -574,10 +574,10 @@ dataView.setBigUint64(2, 123); // should error
 >         : ^^^^^^^^
 >setBigUint64 : (byteOffset: number, value: bigint, littleEndian?: boolean) => void
 >             : ^          ^^      ^^     ^^      ^^            ^^^       ^^^^^    
->2 : number
->  : ^^^^^^
->123 : number
->    : ^^^^^^
+>2 : 2
+>  : ^
+>123 : 123
+>    : ^^^
 
 bigintVal = dataView.getBigInt64(1);
 >bigintVal = dataView.getBigInt64(1) : bigint
@@ -592,8 +592,8 @@ bigintVal = dataView.getBigInt64(1);
 >         : ^^^^^^^^
 >getBigInt64 : (byteOffset: number, littleEndian?: boolean) => bigint
 >            : ^          ^^      ^^            ^^^       ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 bigintVal = dataView.getBigInt64(1, true);
 >bigintVal = dataView.getBigInt64(1, true) : bigint
@@ -608,8 +608,8 @@ bigintVal = dataView.getBigInt64(1, true);
 >         : ^^^^^^^^
 >getBigInt64 : (byteOffset: number, littleEndian?: boolean) => bigint
 >            : ^          ^^      ^^            ^^^       ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -626,8 +626,8 @@ bigintVal = dataView.getBigUint64(2);
 >         : ^^^^^^^^
 >getBigUint64 : (byteOffset: number, littleEndian?: boolean) => bigint
 >             : ^          ^^      ^^            ^^^       ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 bigintVal = dataView.getBigUint64(2, true);
 >bigintVal = dataView.getBigUint64(2, true) : bigint
@@ -642,8 +642,8 @@ bigintVal = dataView.getBigUint64(2, true);
 >         : ^^^^^^^^
 >getBigUint64 : (byteOffset: number, littleEndian?: boolean) => bigint
 >             : ^          ^^      ^^            ^^^       ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -692,8 +692,8 @@ new Intl.NumberFormat("fr").format(3000n);
 >     : ^^^^
 >format : { (value: number): string; (value: number | bigint): string; }
 >       : ^^^     ^^      ^^^      ^^^     ^^               ^^^      ^^^
->3000n : bigint
->      : ^^^^^^
+>3000n : 3000n
+>      : ^^^^^
 
 new Intl.NumberFormat("fr").format(bigintVal);
 >new Intl.NumberFormat("fr").format(bigintVal) : string
diff --git a/tests/baselines/reference/bigintWithoutLib.errors.txt b/tests/baselines/reference/bigintWithoutLib.errors.txt
index d61f8522b64..ee7353bbd29 100644
--- a/tests/baselines/reference/bigintWithoutLib.errors.txt
+++ b/tests/baselines/reference/bigintWithoutLib.errors.txt
@@ -47,10 +47,11 @@ bigintWithoutLib.ts(50,22): error TS2550: Property 'getBigInt64' does not exist
 bigintWithoutLib.ts(51,22): error TS2550: Property 'getBigUint64' does not exist on type 'DataView'. Do you need to change your target library? Try changing the 'lib' compiler option to 'es2020' or later.
 bigintWithoutLib.ts(52,22): error TS2550: Property 'getBigUint64' does not exist on type 'DataView'. Do you need to change your target library? Try changing the 'lib' compiler option to 'es2020' or later.
 bigintWithoutLib.ts(55,36): error TS2345: Argument of type 'bigint' is not assignable to parameter of type 'number'.
+bigintWithoutLib.ts(55,36): error TS2737: BigInt literals are not available when targeting lower than ES2020.
 bigintWithoutLib.ts(56,36): error TS2345: Argument of type 'bigint' is not assignable to parameter of type 'number'.
 
 
-==== bigintWithoutLib.ts (50 errors) ====
+==== bigintWithoutLib.ts (51 errors) ====
     // Every line should error because these builtins are not declared
     
     // Test BigInt functions
@@ -204,6 +205,8 @@ bigintWithoutLib.ts(56,36): error TS2345: Argument of type 'bigint' is not assig
     new Intl.NumberFormat("fr").format(3000n);
                                        ~~~~~
 !!! error TS2345: Argument of type 'bigint' is not assignable to parameter of type 'number'.
+                                       ~~~~~
+!!! error TS2737: BigInt literals are not available when targeting lower than ES2020.
     new Intl.NumberFormat("fr").format(bigintVal);
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type 'bigint' is not assignable to parameter of type 'number'.
diff --git a/tests/baselines/reference/bigintWithoutLib.types b/tests/baselines/reference/bigintWithoutLib.types
index b1b9b398d40..c1ae99c1fe3 100644
--- a/tests/baselines/reference/bigintWithoutLib.types
+++ b/tests/baselines/reference/bigintWithoutLib.types
@@ -260,8 +260,8 @@ bigIntArray = new BigInt64Array(new ArrayBuffer(80));
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
 bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8);
 >bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8) : any
@@ -276,8 +276,8 @@ bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 >8 : 8
 >  : ^
 
@@ -294,8 +294,8 @@ bigIntArray = new BigInt64Array(new ArrayBuffer(80), 8, 3);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 >8 : 8
 >  : ^
 >3 : 3
@@ -399,8 +399,8 @@ bigUintArray = new BigUint64Array(new ArrayBuffer(80));
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
 bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8);
 >bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8) : any
@@ -415,8 +415,8 @@ bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 >8 : 8
 >  : ^
 
@@ -433,8 +433,8 @@ bigUintArray = new BigUint64Array(new ArrayBuffer(80), 8, 3);
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 >8 : 8
 >  : ^
 >3 : 3
@@ -484,8 +484,8 @@ const dataView = new DataView(new ArrayBuffer(80));
 >                    : ^^^^^^^^^^^
 >ArrayBuffer : ArrayBufferConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
 dataView.setBigInt64(1, -1n);
 >dataView.setBigInt64(1, -1n) : any
@@ -667,8 +667,8 @@ new Intl.NumberFormat("fr").format(3000n);
 >     : ^^^^
 >format : (value: number) => string
 >       : ^     ^^      ^^^^^      
->3000n : bigint
->      : ^^^^^^
+>3000n : 3000n
+>      : ^^^^^
 
 new Intl.NumberFormat("fr").format(bigintVal);
 >new Intl.NumberFormat("fr").format(bigintVal) : string
diff --git a/tests/baselines/reference/bindingPatternContextualTypeDoesNotCauseWidening.types b/tests/baselines/reference/bindingPatternContextualTypeDoesNotCauseWidening.types
index 7540b598053..c2ab323df18 100644
--- a/tests/baselines/reference/bindingPatternContextualTypeDoesNotCauseWidening.types
+++ b/tests/baselines/reference/bindingPatternContextualTypeDoesNotCauseWidening.types
@@ -24,12 +24,12 @@ const _    = pick(['b'], { a: 'a', b: 'b' }); // T: "b"
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >b : string
 >  : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
 const {  } = pick(['b'], { a: 'a', b: 'b' }); // T: "b" | "a" ??? (before fix)
 >pick(['b'], { a: 'a', b: 'b' }) : Pick<{ a: string; b: string; }, "b">
@@ -44,10 +44,10 @@ const {  } = pick(['b'], { a: 'a', b: 'b' }); // T: "b" | "a" ??? (before fix)
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >b : string
 >  : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.types b/tests/baselines/reference/binopAssignmentShouldHaveType.types
index ac78103d08f..b070ae3a4c2 100644
--- a/tests/baselines/reference/binopAssignmentShouldHaveType.types
+++ b/tests/baselines/reference/binopAssignmentShouldHaveType.types
@@ -21,7 +21,7 @@ module Test {
 >        : ^^^^^^      
 
    return "name";
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
   }
   bug() {
diff --git a/tests/baselines/reference/bitwiseCompoundAssignmentOperators.types b/tests/baselines/reference/bitwiseCompoundAssignmentOperators.types
index 77123db4594..96eb2889fd2 100644
--- a/tests/baselines/reference/bitwiseCompoundAssignmentOperators.types
+++ b/tests/baselines/reference/bitwiseCompoundAssignmentOperators.types
@@ -38,12 +38,12 @@ b ^= b;
 >  : ^^^^^^
 
 b = 1;
->b = 1 : number
->      : ^^^^^^
+>b = 1 : 1
+>      : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a ^= b;
 >a ^= b : number
@@ -70,12 +70,12 @@ b ^= a;
 >  : ^^^^
 
 b = 1;
->b = 1 : number
->      : ^^^^^^
+>b = 1 : 1
+>      : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var c = false;
 >c : boolean
@@ -114,12 +114,12 @@ d &= d;
 >  : ^^^^^^
 
 d = 2;
->d = 2 : number
->      : ^^^^^^
+>d = 2 : 2
+>      : ^
 >d : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 c &= d;
 >c &= d : number
@@ -182,12 +182,12 @@ f |= f;
 >  : ^^^^^^
 
 f = 0;
->f = 0 : number
->      : ^^^^^^
+>f = 0 : 0
+>      : ^
 >f : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 e |= f;
 >e |= f : number
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
index 476864d18a6..3af2e378053 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
index 4cc4348d493..28ea9682b86 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -203,8 +203,8 @@ var ResultIsNumber12 = ~STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // multiple ~ operators
 var ResultIsNumber13 = ~~STRING;
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types
index 97ec7276aba..fe2516a7538 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types
@@ -55,12 +55,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
     }
     else {
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
@@ -118,12 +118,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
     }
     else {
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
@@ -187,12 +187,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
     }
     else {
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
@@ -256,11 +256,11 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
     }
     else {
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types
index 7fc08af507c..8c97a9fd79f 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types
@@ -102,12 +102,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
         }
         
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
@@ -213,12 +213,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
         }
         
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
@@ -339,12 +339,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
         }
         
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
@@ -465,12 +465,12 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
         }
         
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types
index a96a70f4fc9..0091b3420b4 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types
@@ -61,12 +61,12 @@ function f1() {
         }
         else {
             y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
         }
     }
 }
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types
index 06429f5e274..70c4bc49ab9 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types
@@ -54,11 +54,11 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
         break;
     else 
         y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 }
 
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types
index 0ce209c71f0..15d16b1861b 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types
@@ -67,12 +67,12 @@ function f1() {
 >  : ^
 
             y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
         else
             return;
@@ -161,12 +161,12 @@ function f2() {
 >  : ^
 
             y = 5;
->y = 5 : number
->      : ^^^^^^
+>y = 5 : 5
+>      : ^
 >y : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
         else
             return;
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.types b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.types
index bea38f9ee12..33989fec673 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.types
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.types
@@ -71,8 +71,8 @@ foo(10);
 >        : ^^^^
 >foo : (a: number) => void
 >    : ^ ^^      ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 foo(); // not ok - needs number
 >foo() : void
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.types b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.types
index 8fbdda965a8..5820765d029 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.types
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.types
@@ -71,8 +71,8 @@ foo(10);
 >        : ^^^^
 >foo : (a: number) => void
 >    : ^ ^^      ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 foo(); // not ok - needs number
 >foo() : void
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.types b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.types
index 61e265dd2bc..940f990526e 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.types
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.types
@@ -61,8 +61,8 @@ function foo(a: number) {
 >        : ^^^^
 >foo : (a: number) => void
 >    : ^ ^^      ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     foo(); // not ok - needs number
 >foo() : void
@@ -75,8 +75,8 @@ foo(10);
 >        : ^^^^
 >foo : (a: number) => void
 >    : ^ ^^      ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 foo(); // not ok - needs number
 >foo() : void
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.types b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.types
index 10f332b6480..b826a5f8b8f 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.types
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.types
@@ -61,8 +61,8 @@ function foo(a: number) {
 >        : ^^^^
 >foo : (a: number) => void
 >    : ^ ^^      ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     foo(); // not ok
 >foo() : void
@@ -75,8 +75,8 @@ foo(10);
 >        : ^^^^
 >foo : (a: number) => void
 >    : ^ ^^      ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 foo(); // not ok - needs number
 >foo() : void
diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types
index bd3c599d6c7..9c59ef6b7a3 100644
--- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types
+++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types
@@ -380,12 +380,12 @@ function foo15() {
 >                                       : ^^^^^^^^^^^^^^^^
 
             0,
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
             0,
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         ];
     })();    
diff --git a/tests/baselines/reference/booleanLiteralTypes1.types b/tests/baselines/reference/booleanLiteralTypes1.types
index 73611e0b927..bc640f5e0c4 100644
--- a/tests/baselines/reference/booleanLiteralTypes1.types
+++ b/tests/baselines/reference/booleanLiteralTypes1.types
@@ -259,8 +259,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function f10(x: true | false) {
diff --git a/tests/baselines/reference/booleanLiteralTypes2.types b/tests/baselines/reference/booleanLiteralTypes2.types
index 066be9801aa..484597c1ebe 100644
--- a/tests/baselines/reference/booleanLiteralTypes2.types
+++ b/tests/baselines/reference/booleanLiteralTypes2.types
@@ -259,8 +259,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function f10(x: true | false) {
diff --git a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
index bbac9513dc9..087cc757c2f 100644
--- a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
+++ b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
@@ -50,16 +50,16 @@ const c: C = isIt ? { isIt, text: 'hey' } : { isIt, value: 123 };
 >     : ^^^^
 >text : string
 >     : ^^^^^^
->'hey' : string
->      : ^^^^^^
+>'hey' : "hey"
+>      : ^^^^^
 >{ isIt, value: 123 } : { isIt: false; value: number; }
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >isIt : false
 >     : ^^^^^
 >value : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 const cc: C = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
 >cc : C
@@ -76,8 +76,8 @@ const cc: C = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
 >     : ^^^^
 >text : string
 >     : ^^^^^^
->'hey' : string
->      : ^^^^^^
+>'hey' : "hey"
+>      : ^^^^^
 >{ isIt: isIt, value: 123 } : { isIt: false; value: number; }
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >isIt : false
@@ -86,8 +86,8 @@ const cc: C = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
 >     : ^^^^^
 >value : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 type ComponentProps =
 >ComponentProps : ComponentProps
diff --git a/tests/baselines/reference/bundlerSyntaxRestrictions(module=esnext).types b/tests/baselines/reference/bundlerSyntaxRestrictions(module=esnext).types
index fb4d59cc601..9bd31ef4b3c 100644
--- a/tests/baselines/reference/bundlerSyntaxRestrictions(module=esnext).types
+++ b/tests/baselines/reference/bundlerSyntaxRestrictions(module=esnext).types
@@ -46,8 +46,8 @@ import {} from "./a";
 import("./a");
 >import("./a") : Promise<typeof _>
 >              : ^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 
 const _ = require("./a");
 >_ : typeof _
diff --git a/tests/baselines/reference/bundlerSyntaxRestrictions(module=preserve).types b/tests/baselines/reference/bundlerSyntaxRestrictions(module=preserve).types
index fb4d59cc601..9bd31ef4b3c 100644
--- a/tests/baselines/reference/bundlerSyntaxRestrictions(module=preserve).types
+++ b/tests/baselines/reference/bundlerSyntaxRestrictions(module=preserve).types
@@ -46,8 +46,8 @@ import {} from "./a";
 import("./a");
 >import("./a") : Promise<typeof _>
 >              : ^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 
 const _ = require("./a");
 >_ : typeof _
diff --git a/tests/baselines/reference/callChain.3.types b/tests/baselines/reference/callChain.3.types
index 65d436c5226..64314d5a7b2 100644
--- a/tests/baselines/reference/callChain.3.types
+++ b/tests/baselines/reference/callChain.3.types
@@ -30,8 +30,8 @@ const n1: number = a?.m?.({x: 12 }); // should be an error (`undefined` is not a
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const n2: number = a?.m?.({x: absorb()}); // likewise
 >n2 : number
@@ -68,8 +68,8 @@ const n3: number | undefined = a?.m?.({x: 12}); // should be ok
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const n4: number | undefined = a?.m?.({x: absorb()}); // likewise
 >n4 : number | undefined
@@ -107,8 +107,8 @@ let t1 = a?.m?.({x: 12});
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 t1 = a!.m!({x: 12});
 >t1 = a!.m!({x: 12}) : number
@@ -131,6 +131,6 @@ t1 = a!.m!({x: 12});
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
index 9ebc41687c4..d142977e5f2 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
@@ -19,10 +19,10 @@ var r1 = f<number>(1, '');
 >                 : ^^^^^^
 >f : <T, U>(x: T, y: U) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r1b = f<number, string, number>(1, '');
 >r1b : number
@@ -31,10 +31,10 @@ var r1b = f<number, string, number>(1, '');
 >                                 : ^^^^^^
 >f : <T, U>(x: T, y: U) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var f2 = <T, U>(x: T, y: U): T => { return null; }
 >f2 : <T, U>(x: T, y: U) => T
@@ -53,10 +53,10 @@ var r2 = f2<number>(1, '');
 >                  : ^^^^^^
 >f2 : <T, U>(x: T, y: U) => T
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r2b = f2<number, string, number>(1, '');
 >r2b : number
@@ -65,10 +65,10 @@ var r2b = f2<number, string, number>(1, '');
 >                                  : ^^^^^^
 >f2 : <T, U>(x: T, y: U) => T
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var f3: { <T, U>(x: T, y: U): T; }
 >f3 : <T, U>(x: T, y: U) => T
@@ -85,10 +85,10 @@ var r3 = f3<number>(1, '');
 >                  : ^^^^^^
 >f3 : <T, U>(x: T, y: U) => T
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r3b = f3<number, string, number>(1, '');
 >r3b : number
@@ -97,10 +97,10 @@ var r3b = f3<number, string, number>(1, '');
 >                                  : ^^^^^^
 >f3 : <T, U>(x: T, y: U) => T
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 class C {
 >C : C
@@ -132,10 +132,10 @@ var r4 = (new C()).f<number>(1, '');
 >  : ^^^^^^^^
 >f : <T, U>(x: T, y: U) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r4b = (new C()).f<number, string, number>(1, '');
 >r4b : number
@@ -152,10 +152,10 @@ var r4b = (new C()).f<number, string, number>(1, '');
 >  : ^^^^^^^^
 >f : <T, U>(x: T, y: U) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 interface I {
     f<T, U>(x: T, y: U): T;
@@ -181,10 +181,10 @@ var r5 = i.f<number>(1, '');
 >  : ^
 >f : <T, U>(x: T, y: U) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r5b = i.f<number, string, number>(1, '');
 >r5b : number
@@ -197,10 +197,10 @@ var r5b = i.f<number, string, number>(1, '');
 >  : ^
 >f : <T, U>(x: T, y: U) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 class C2<T, U> {
 >C2 : C2<T, U>
@@ -232,10 +232,10 @@ var r6 = (new C2()).f<number>(1, '');
 >   : ^^^^^^^^^
 >f : (x: unknown, y: unknown) => unknown
 >  : ^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r6b = (new C2()).f<number, string, number>(1, '');
 >r6b : unknown
@@ -252,10 +252,10 @@ var r6b = (new C2()).f<number, string, number>(1, '');
 >   : ^^^^^^^^^
 >f : (x: unknown, y: unknown) => unknown
 >  : ^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 interface I2<T, U> {
     f(x: T, y: U): T;
@@ -281,10 +281,10 @@ var r7 = i2.f<number>(1, '');
 >   : ^^^^^^^^^^^^^^^^^^
 >f : (x: number, y: string) => number
 >  : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r7b = i2.f<number, string, number>(1, '');
 >r7b : number
@@ -297,8 +297,8 @@ var r7b = i2.f<number, string, number>(1, '');
 >   : ^^^^^^^^^^^^^^^^^^
 >f : (x: number, y: string) => number
 >  : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
index 3cb4eb9b20b..0b5ad395d1e 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
@@ -137,8 +137,8 @@ var r6 = (new C2()).f(1);
 >   : ^^^^^^^^^
 >f : (x: unknown) => unknown
 >  : ^ ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface I2<T> {
     f(x: T): T;
@@ -162,6 +162,6 @@ var r7 = i2.f(1);
 >   : ^^^^^^^^^^
 >f : (x: number) => number
 >  : ^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
index 68dfc2fa084..b5bfc3d90cc 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
@@ -17,8 +17,8 @@ var r = f<string>(1);
 >             : ^^^
 >f : (x: number) => any
 >  : ^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f2 = (x: number) => { return null; }
 >f2 : (x: number) => any
@@ -35,8 +35,8 @@ var r2 = f2<string>(1);
 >              : ^^^
 >f2 : (x: number) => any
 >   : ^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f3: { (x: number): any; }
 >f3 : (x: number) => any
@@ -51,8 +51,8 @@ var r3 = f3<string>(1);
 >              : ^^^
 >f3 : (x: number) => any
 >   : ^ ^^      ^^^^^   
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C {
 >C : C
@@ -82,8 +82,8 @@ var r4 = (new C()).f<string>(1);
 >  : ^^^^^^^^
 >f : (x: number) => any
 >  : ^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface I {
     f(x: number): any;
@@ -107,8 +107,8 @@ var r5 = i.f<string>(1);
 >  : ^
 >f : (x: number) => any
 >  : ^ ^^      ^^^^^   
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C2 {
 >C2 : C2
@@ -138,8 +138,8 @@ var r6 = (new C2()).f<string>(1);
 >   : ^^^^^^^^^
 >f : (x: number) => any
 >  : ^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface I2 {
     f(x: number);
@@ -163,8 +163,8 @@ var r7 = i2.f<string>(1);
 >   : ^^
 >f : (x: number) => any
 >  : ^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var a;
 >a : any
diff --git a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types
index 98215ef95c7..18587d635d7 100644
--- a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types
+++ b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types
@@ -20,8 +20,8 @@ function fn<T>(arg: Q<T>) {
 >        : ^^^^
 >arg : Q<T>
 >    : ^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 }
 // Legal invocations are not problematic
 fn<string | number>(m => m.toFixed());
@@ -124,8 +124,8 @@ fn2<string | number>(m => m(42));
 >      : ^^^^
 >m : (n: number) => void
 >  : ^ ^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 fn2<number>(m => m(42));
 >fn2<number>(m => m(42)) : void
@@ -140,8 +140,8 @@ fn2<number>(m => m(42));
 >      : ^^^^
 >m : (n: number) => void
 >  : ^ ^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 // webidl-conversions example where substituion must occur, despite contravariance of the position
 // due to the invariant usage in `Parameters`
diff --git a/tests/baselines/reference/callOnInstance.types b/tests/baselines/reference/callOnInstance.types
index 4077624002e..06ad192d77a 100644
--- a/tests/baselines/reference/callOnInstance.types
+++ b/tests/baselines/reference/callOnInstance.types
@@ -30,8 +30,8 @@ var s2: string = (new D(1))();
 >         : ^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 declare class C { constructor(value: number); }
 >C : C
@@ -48,6 +48,6 @@ declare class C { constructor(value: number); }
 >         : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/callOverloadViaElementAccessExpression.types b/tests/baselines/reference/callOverloadViaElementAccessExpression.types
index b33772cccb2..a4faf9b674c 100644
--- a/tests/baselines/reference/callOverloadViaElementAccessExpression.types
+++ b/tests/baselines/reference/callOverloadViaElementAccessExpression.types
@@ -46,8 +46,8 @@ var r: string = c['foo'](1);
 >  : ^
 >'foo' : "foo"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r2: number = c['foo']('');
 >r2 : number
@@ -60,6 +60,6 @@ var r2: number = c['foo']('');
 >  : ^
 >'foo' : "foo"
 >      : ^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/callOverloads3.types b/tests/baselines/reference/callOverloads3.types
index de3a031498a..3e7b5bceb81 100644
--- a/tests/baselines/reference/callOverloads3.types
+++ b/tests/baselines/reference/callOverloads3.types
@@ -60,6 +60,6 @@ Foo("s");
 >         : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
diff --git a/tests/baselines/reference/callOverloads4.types b/tests/baselines/reference/callOverloads4.types
index f99a07509d2..9719d128cda 100644
--- a/tests/baselines/reference/callOverloads4.types
+++ b/tests/baselines/reference/callOverloads4.types
@@ -38,8 +38,8 @@ var f1 = new Foo("hey");
 >               : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"hey" : string
->      : ^^^^^^
+>"hey" : "hey"
+>      : ^^^^^
 
 
 f1.bar1();
@@ -63,6 +63,6 @@ Foo("s");
 >         : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
diff --git a/tests/baselines/reference/callOverloads5.types b/tests/baselines/reference/callOverloads5.types
index f049b5e7a7b..acfcbebf278 100644
--- a/tests/baselines/reference/callOverloads5.types
+++ b/tests/baselines/reference/callOverloads5.types
@@ -62,8 +62,8 @@ f1.bar1("a");
 >   : ^^^
 >bar1 : { (s: string): any; (n: number): any; }
 >     : ^^^ ^^      ^^^^^^^^^ ^^      ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 Foo();
 >Foo() : Foo
@@ -76,6 +76,6 @@ Foo("s");
 >         : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
index 42b24996e1a..ccb78e2afb7 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
@@ -8,8 +8,8 @@ function foo(x?: number = 1) { }
 >    : ^ ^^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f = function foo(x?: number = 1) { }
 >f : (x?: number) => void
@@ -20,8 +20,8 @@ var f = function foo(x?: number = 1) { }
 >    : ^ ^^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f2 = (x: number, y? = 1) => { }
 >f2 : (x: number, y?: number) => void
@@ -40,8 +40,8 @@ foo(1);
 >       : ^^^^
 >foo : (x?: number) => void
 >    : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo();
 >foo() : void
@@ -54,8 +54,8 @@ f(1);
 >     : ^^^^
 >f : (x?: number) => void
 >  : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f();
 >f() : void
@@ -68,18 +68,18 @@ f2(1);
 >      : ^^^^
 >f2 : (x: number, y?: number) => void
 >   : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f2(1, 2);
 >f2(1, 2) : void
 >         : ^^^^
 >f2 : (x: number, y?: number) => void
 >   : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class C {
 >C : C
@@ -90,8 +90,8 @@ class C {
 >    : ^ ^^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 var c: C;
@@ -117,8 +117,8 @@ c.foo(1);
 >  : ^
 >foo : (x?: number) => void
 >    : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface I {
     (x? = 1);
@@ -134,8 +134,8 @@ interface I {
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 var i: I;
@@ -153,8 +153,8 @@ i(1);
 >     : ^^^
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1);
 >i.foo(1) : any
@@ -165,8 +165,8 @@ i.foo(1);
 >  : ^
 >foo : (x: number, y?: number) => any
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1, 2);
 >i.foo(1, 2) : any
@@ -177,10 +177,10 @@ i.foo(1, 2);
 >  : ^
 >foo : (x: number, y?: number) => any
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var a: {
 >a : { (x?: number): any; foo(x?: number): any; }
@@ -189,8 +189,8 @@ var a: {
     (x?: number = 1);
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     foo(x? = 1);
 >foo : (x?: number) => any
@@ -212,8 +212,8 @@ a(1);
 >     : ^^^
 >a : { (x?: number): any; foo(x?: number): any; }
 >  : ^^^ ^^^      ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a.foo();
 >a.foo() : any
@@ -234,8 +234,8 @@ a.foo(1);
 >  : ^^^ ^^^      ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 >foo : (x?: number) => any
 >    : ^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var b = {
 >b : { foo(x?: number): void; a: (x: number, y?: number) => void; b: (x?: any) => void; }
@@ -248,8 +248,8 @@ var b = {
 >    : ^ ^^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a: function foo(x: number, y?: number = '') { },
 >a : (x: number, y?: number) => void
@@ -262,8 +262,8 @@ var b = {
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     b: (x?: any = '') => { }
 >b : (x?: any) => void
@@ -295,8 +295,8 @@ b.foo(1);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^   ^^^^^^^^^^^^
 >foo : (x?: number) => void
 >    : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.a(1);
 >b.a(1) : void
@@ -307,8 +307,8 @@ b.a(1);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^   ^^^^^^^^^^^^
 >a : (x: number, y?: number) => void
 >  : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.a(1, 2);
 >b.a(1, 2) : void
@@ -319,10 +319,10 @@ b.a(1, 2);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^   ^^^^^^^^^^^^
 >a : (x: number, y?: number) => void
 >  : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 b.b();
 >b.b() : void
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 1311fc87934..724f9957388 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -184,8 +184,8 @@ var r8 = foo8(1);
 >        : ^^^^^^^^^^^^^^
 >foo8 : (x: number) => { x: number; }
 >     : ^ ^^      ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface I {
     foo: string;
@@ -213,8 +213,8 @@ var r9 = foo9(1);
 >        : ^
 >foo9 : (x: number) => I
 >     : ^ ^^      ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C {
 >C : C
@@ -245,8 +245,8 @@ var r10 = foo10(1);
 >         : ^
 >foo10 : (x: number) => C
 >      : ^ ^^      ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 module M {
 >M : typeof M
diff --git a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
index 01946f76b7d..383eb966f6b 100644
--- a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
+++ b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
@@ -24,8 +24,8 @@ function foo() {
 >                                          : ^^^^
 >test : I1<string>
 >     : ^^^^^^^^^^
->"expects boolean instead of string" : string
->                                    : ^^^^^^
+>"expects boolean instead of string" : "expects boolean instead of string"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     test(true); // should error - string expected
 >test(true) : void
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
index 09dd23941a9..3dc65a28fed 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
@@ -30,8 +30,8 @@ var r = x.foo(1); // no error
 >  : ^
 >foo : (x: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r2 = x.foo(''); // error
 >r2 : number
@@ -44,6 +44,6 @@ var r2 = x.foo(''); // error
 >  : ^
 >foo : (x: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.types b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
index cd090ad67d6..2f93e958249 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
@@ -34,8 +34,8 @@ foo(1);
 >       : ^^^^
 >foo : (x?: number) => void
 >    : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo();
 >foo() : void
@@ -48,8 +48,8 @@ f(1);
 >     : ^^^^
 >f : (x?: number) => void
 >  : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f();
 >f() : void
@@ -62,18 +62,18 @@ f2(1);
 >      : ^^^^
 >f2 : (x: number, y?: number) => void
 >   : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f2(1, 2);
 >f2(1, 2) : void
 >         : ^^^^
 >f2 : (x: number, y?: number) => void
 >   : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class C {
 >C : C
@@ -109,8 +109,8 @@ c.foo(1);
 >  : ^
 >foo : (x?: number) => void
 >    : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface I {
     (x?: number);
@@ -139,8 +139,8 @@ i(1);
 >i(1) : any
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1);
 >i.foo(1) : any
@@ -150,8 +150,8 @@ i.foo(1);
 >  : ^
 >foo : (x: number, y?: number) => any
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1, 2);
 >i.foo(1, 2) : any
@@ -161,10 +161,10 @@ i.foo(1, 2);
 >  : ^
 >foo : (x: number, y?: number) => any
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var a: {
 >a : { (x?: number): any; foo(x?: number): any; }
@@ -190,8 +190,8 @@ a(1);
 >a(1) : any
 >a : { (x?: number): any; foo(x?: number): any; }
 >  : ^^^ ^^^      ^^^^^^^^^^^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a.foo();
 >a.foo() : any
@@ -210,8 +210,8 @@ a.foo(1);
 >  : ^^^ ^^^      ^^^^^^^^^^^^ ^^^      ^^^^^^^^^
 >foo : (x?: number) => any
 >    : ^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var b = {
 >b : { foo(x?: number): void; a: (x: number, y?: number) => void; b: (x?: number) => void; }
@@ -265,8 +265,8 @@ b.foo(1);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^      ^^^^^^^^^^^^
 >foo : (x?: number) => void
 >    : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.a(1);
 >b.a(1) : void
@@ -277,8 +277,8 @@ b.a(1);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^      ^^^^^^^^^^^^
 >a : (x: number, y?: number) => void
 >  : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.a(1, 2);
 >b.a(1, 2) : void
@@ -289,10 +289,10 @@ b.a(1, 2);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^      ^^^^^^^^^^^^
 >a : (x: number, y?: number) => void
 >  : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 b.b();
 >b.b() : void
@@ -313,6 +313,6 @@ b.b(1);
 >  : ^^^^^^ ^^^      ^^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^      ^^^^^^^^^^^^
 >b : (x?: number) => void
 >  : ^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
index eb07accddd8..8e0e8718e6b 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
@@ -19,8 +19,8 @@ foo(1);
 >foo(1) : any
 >foo : (x?: number) => any
 >    : ^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo();
 >foo() : any
@@ -53,17 +53,17 @@ foo2(1);
 >foo2(1) : any
 >foo2 : { (x: number): any; (x: number, y?: number): any; }
 >     : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo2(1, 2);
 >foo2(1, 2) : any
 >foo2 : { (x: number): any; (x: number, y?: number): any; }
 >     : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class C {
 >C : C
@@ -125,8 +125,8 @@ c.foo(1);
 >  : ^
 >foo : (x?: number) => any
 >    : ^ ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.foo2(1);
 >c.foo2(1) : any
@@ -136,8 +136,8 @@ c.foo2(1);
 >  : ^
 >foo2 : { (x: number): any; (x: number, y?: number): any; }
 >     : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.foo2(1, 2);
 >c.foo2(1, 2) : any
@@ -147,10 +147,10 @@ c.foo2(1, 2);
 >  : ^
 >foo2 : { (x: number): any; (x: number, y?: number): any; }
 >     : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 interface I {
     (x?: number);
@@ -195,17 +195,17 @@ i(1);
 >i(1) : any
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i(1, 2);
 >i(1, 2) : any
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 i.foo(1);
 >i.foo(1) : any
@@ -215,8 +215,8 @@ i.foo(1);
 >  : ^
 >foo : { (x: number, y?: number): any; (x: number, y?: number, z?: number): any; }
 >    : ^^^ ^^      ^^ ^^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1, 2);
 >i.foo(1, 2) : any
@@ -226,10 +226,10 @@ i.foo(1, 2);
 >  : ^
 >foo : { (x: number, y?: number): any; (x: number, y?: number, z?: number): any; }
 >    : ^^^ ^^      ^^ ^^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 i.foo(1, 2, 3);
 >i.foo(1, 2, 3) : any
@@ -239,12 +239,12 @@ i.foo(1, 2, 3);
 >  : ^
 >foo : { (x: number, y?: number): any; (x: number, y?: number, z?: number): any; }
 >    : ^^^ ^^      ^^ ^^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 var a: {
 >a : { (x?: number): any; (x?: number, y?: number): any; foo(x: number, y?: number): any; foo(x: number, y?: number, z?: number): any; }
@@ -288,17 +288,17 @@ a(1);
 >a(1) : any
 >a : { (x?: number): any; (x?: number, y?: number): any; foo(x: number, y?: number): any; foo(x: number, y?: number, z?: number): any; }
 >  : ^^^ ^^^      ^^^^^^^^^ ^^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a(1, 2);
 >a(1, 2) : any
 >a : { (x?: number): any; (x?: number, y?: number): any; foo(x: number, y?: number): any; foo(x: number, y?: number, z?: number): any; }
 >  : ^^^ ^^^      ^^^^^^^^^ ^^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 a.foo(1);
 >a.foo(1) : any
@@ -308,8 +308,8 @@ a.foo(1);
 >  : ^^^ ^^^      ^^^^^^^^^ ^^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
 >foo : { (x: number, y?: number): any; (x: number, y?: number, z?: number): any; }
 >    : ^^^ ^^      ^^ ^^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a.foo(1, 2);
 >a.foo(1, 2) : any
@@ -319,10 +319,10 @@ a.foo(1, 2);
 >  : ^^^ ^^^      ^^^^^^^^^ ^^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
 >foo : { (x: number, y?: number): any; (x: number, y?: number, z?: number): any; }
 >    : ^^^ ^^      ^^ ^^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 a.foo(1, 2, 3);
 >a.foo(1, 2, 3) : any
@@ -332,10 +332,10 @@ a.foo(1, 2, 3);
 >  : ^^^ ^^^      ^^^^^^^^^ ^^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
 >foo : { (x: number, y?: number): any; (x: number, y?: number, z?: number): any; }
 >    : ^^^ ^^      ^^ ^^^      ^^^^^^^^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.types b/tests/baselines/reference/callSignaturesWithParameterInitializers.types
index f8e4907ee8e..2c5664d42aa 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.types
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.types
@@ -40,8 +40,8 @@ foo(1);
 >       : ^^^^
 >foo : (x?: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo();
 >foo() : void
@@ -54,8 +54,8 @@ f(1);
 >     : ^^^^
 >f : (x?: number) => void
 >  : ^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f();
 >f() : void
@@ -68,18 +68,18 @@ f2(1);
 >      : ^^^^
 >f2 : (x: number, y?: number) => void
 >   : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f2(1, 2);
 >f2(1, 2) : void
 >         : ^^^^
 >f2 : (x: number, y?: number) => void
 >   : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class C {
 >C : C
@@ -117,8 +117,8 @@ c.foo(1);
 >  : ^
 >foo : (x?: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // these are errors
 interface I {
@@ -154,8 +154,8 @@ i(1);
 >     : ^^^
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1);
 >i.foo(1) : any
@@ -166,8 +166,8 @@ i.foo(1);
 >  : ^
 >foo : (x: number, y?: number) => any
 >    : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i.foo(1, 2);
 >i.foo(1, 2) : any
@@ -178,10 +178,10 @@ i.foo(1, 2);
 >  : ^
 >foo : (x: number, y?: number) => any
 >    : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // these are errors
 var a: {
@@ -214,8 +214,8 @@ a(1);
 >     : ^^^
 >a : { (x?: number): any; foo(x?: number): any; }
 >  : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a.foo();
 >a.foo() : any
@@ -236,8 +236,8 @@ a.foo(1);
 >  : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 >foo : (x?: number) => any
 >    : ^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var b = {
 >b : { foo(x?: number): void; a: (x: number, y?: number) => void; b: (x?: number) => void; }
@@ -297,8 +297,8 @@ b.foo(1);
 >  : ^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^ ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
 >foo : (x?: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.a(1);
 >b.a(1) : void
@@ -309,8 +309,8 @@ b.a(1);
 >  : ^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^ ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
 >a : (x: number, y?: number) => void
 >  : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.a(1, 2);
 >b.a(1, 2) : void
@@ -321,10 +321,10 @@ b.a(1, 2);
 >  : ^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^ ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
 >a : (x: number, y?: number) => void
 >  : ^ ^^      ^^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 b.b();
 >b.b() : void
@@ -345,6 +345,6 @@ b.b(1);
 >  : ^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^ ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
 >b : (x?: number) => void
 >  : ^ ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.types b/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
index e50aa239245..ae95c38495d 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
@@ -25,8 +25,8 @@ foo(1);
 >       : ^^^
 >foo : (x?: number) => any
 >    : ^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo();
 >foo() : any
@@ -78,8 +78,8 @@ c.foo(1);
 >  : ^
 >foo : (x?: number) => any
 >    : ^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var b = {
 >b : { foo(x?: number): any; foo(x?: number): void; }
@@ -123,6 +123,6 @@ b.foo(1);
 >  : ^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
 >foo : { (x?: number): any; (x?: number): void; }
 >    : ^^^ ^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/callWithMissingVoid.types b/tests/baselines/reference/callWithMissingVoid.types
index 0795a20037f..a506760c192 100644
--- a/tests/baselines/reference/callWithMissingVoid.types
+++ b/tests/baselines/reference/callWithMissingVoid.types
@@ -212,20 +212,20 @@ a(4, "hello"); // ok
 >              : ^^^^
 >a : (x: number, y: string, z: void) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^^^^    
->4 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>4 : 4
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 a(4, "hello", void 0); // ok
 >a(4, "hello", void 0) : void
 >                      : ^^^^
 >a : (x: number, y: string, z: void) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^^^^    
->4 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>4 : 4
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 >void 0 : undefined
 >       : ^^^^^^^^^
 >0 : 0
@@ -236,8 +236,8 @@ a(4); // not ok
 >     : ^^^^
 >a : (x: number, y: string, z: void) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^^^^    
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 function b(x: number, y: string, z: void, what: number): void  {
 >b : (x: number, y: string, z: void, what: number) => void
@@ -258,36 +258,36 @@ b(4, "hello", void 0, 2); // ok
 >                         : ^^^^
 >b : (x: number, y: string, z: void, what: number) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^    ^^      ^^^^^    
->4 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>4 : 4
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 >void 0 : undefined
 >       : ^^^^^^^^^
 >0 : 0
 >  : ^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 b(4, "hello"); // not ok
 >b(4, "hello") : void
 >              : ^^^^
 >b : (x: number, y: string, z: void, what: number) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^    ^^      ^^^^^    
->4 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>4 : 4
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 b(4, "hello", void 0); // not ok
 >b(4, "hello", void 0) : void
 >                      : ^^^^
 >b : (x: number, y: string, z: void, what: number) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^    ^^      ^^^^^    
->4 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>4 : 4
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 >void 0 : undefined
 >       : ^^^^^^^^^
 >0 : 0
@@ -298,8 +298,8 @@ b(4); // not ok
 >     : ^^^^
 >b : (x: number, y: string, z: void, what: number) => void
 >  : ^ ^^      ^^ ^^      ^^ ^^    ^^    ^^      ^^^^^    
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 function c(x: number | void, y: void, z: void | string | number): void  {
 >c : (x: number | void, y: void, z: void | string | number) => void
@@ -407,10 +407,10 @@ call((x: number, y: number) => x + y, 4, 2) // ok
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
+>2 : 2
+>  : ^
 
 call((x: number, y: void) => x, 4, void 0) // ok
 >call((x: number, y: void) => x, 4, void 0) : void
@@ -425,8 +425,8 @@ call((x: number, y: void) => x, 4, void 0) // ok
 >  : ^^^^
 >x : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >void 0 : undefined
 >       : ^^^^^^^^^
 >0 : 0
@@ -445,8 +445,8 @@ call((x: number, y: void) => x, 4) // ok
 >  : ^^^^
 >x : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 call((x: void, y: void) => 42) // ok
 >call((x: void, y: void) => 42) : void
@@ -489,8 +489,8 @@ call((x: number | void, y: number | void) => 42, 4) // ok
 >  : ^^^^^^^^^^^^^
 >42 : 42
 >   : ^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 call((x: number | void, y: number | void) => 42, 4, 2) // ok
 >call((x: number | void, y: number | void) => 42, 4, 2) : void
@@ -503,10 +503,10 @@ call((x: number | void, y: number | void) => 42, 4, 2) // ok
 >  : ^^^^^^^^^^^^^
 >y : number | void
 >  : ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->4 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>42 : 42
+>   : ^^
+>4 : 4
+>  : ^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/callWithSpread.types b/tests/baselines/reference/callWithSpread.types
index eed7a4dea7c..8aef499d6fd 100644
--- a/tests/baselines/reference/callWithSpread.types
+++ b/tests/baselines/reference/callWithSpread.types
@@ -45,22 +45,22 @@ foo(1, 2, "abc");
 >                 : ^^^^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 foo(1, 2, ...a);
 >foo(1, 2, ...a) : void
 >                : ^^^^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -71,16 +71,16 @@ foo(1, 2, ...a, "abc");
 >                       : ^^^^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 obj.foo(1, 2, "abc");
 >obj.foo(1, 2, "abc") : X
@@ -91,12 +91,12 @@ obj.foo(1, 2, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 obj.foo(1, 2, ...a);
 >obj.foo(1, 2, ...a) : X
@@ -107,10 +107,10 @@ obj.foo(1, 2, ...a);
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -125,16 +125,16 @@ obj.foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 obj.foo(1, 2, ...a).foo(1, 2, "abc");
 >obj.foo(1, 2, ...a).foo(1, 2, "abc") : X
@@ -149,22 +149,22 @@ obj.foo(1, 2, ...a).foo(1, 2, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 obj.foo(1, 2, ...a).foo(1, 2, ...a);
 >obj.foo(1, 2, ...a).foo(1, 2, ...a) : X
@@ -179,20 +179,20 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a);
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -211,26 +211,26 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 (obj.foo)(1, 2, "abc");
 >(obj.foo)(1, 2, "abc") : X
@@ -243,12 +243,12 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 (obj.foo)(1, 2, ...a);
 >(obj.foo)(1, 2, ...a) : X
@@ -261,10 +261,10 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -281,16 +281,16 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 ((obj.foo)(1, 2, ...a).foo)(1, 2, "abc");
 >((obj.foo)(1, 2, ...a).foo)(1, 2, "abc") : X
@@ -309,22 +309,22 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 ((obj.foo)(1, 2, ...a).foo)(1, 2, ...a);
 >((obj.foo)(1, 2, ...a).foo)(1, 2, ...a) : X
@@ -343,20 +343,20 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -379,26 +379,26 @@ obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 xa[1].foo(1, 2, "abc");
 >xa[1].foo(1, 2, "abc") : X
@@ -413,12 +413,12 @@ xa[1].foo(1, 2, "abc");
 >  : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 xa[1].foo(1, 2, ...a);
 >xa[1].foo(1, 2, ...a) : X
@@ -433,10 +433,10 @@ xa[1].foo(1, 2, ...a);
 >  : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -455,16 +455,16 @@ xa[1].foo(1, 2, ...a, "abc");
 >  : ^
 >foo : (x: number, y: number, ...z: string[]) => X
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 (<Function>xa[1].foo)(...[1, 2, "abc"]);
 >(<Function>xa[1].foo)(...[1, 2, "abc"]) : any
@@ -561,20 +561,20 @@ class D extends C {
 >            : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
         super(1, 2, ...a);
 >super(1, 2, ...a) : void
 >                  : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -593,10 +593,10 @@ class D extends C {
 >      : ^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
         super.foo(1, 2, ...a);
 >super.foo(1, 2, ...a) : void
@@ -607,10 +607,10 @@ class D extends C {
 >      : ^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
diff --git a/tests/baselines/reference/callWithSpread2.types b/tests/baselines/reference/callWithSpread2.types
index a45e7c002dc..46bc52ec638 100644
--- a/tests/baselines/reference/callWithSpread2.types
+++ b/tests/baselines/reference/callWithSpread2.types
@@ -119,8 +119,8 @@ prefix("a", ...ns)
 >                   : ^^^^
 >prefix : (s: string, a?: number, b?: number) => void
 >       : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 >...ns : number
 >      : ^^^^^^
 >ns : number[]
@@ -131,8 +131,8 @@ rest("d", ...ns)
 >                 : ^^^^
 >rest : (s: string, a?: number, b?: number, ...rest: number[]) => void
 >     : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    ^^        ^^^^^    
->"d" : string
->    : ^^^^^^
+>"d" : "d"
+>    : ^^^
 >...ns : number
 >      : ^^^^^^
 >ns : number[]
@@ -145,8 +145,8 @@ normal("g", ...ns)
 >                   : ^^^^
 >normal : (s: string) => void
 >       : ^ ^^      ^^^^^    
->"g" : string
->    : ^^^^^^
+>"g" : "g"
+>    : ^^^
 >...ns : number
 >      : ^^^^^^
 >ns : number[]
@@ -188,8 +188,8 @@ prefix("b", ...mixed)
 >                      : ^^^^
 >prefix : (s: string, a?: number, b?: number) => void
 >       : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 >...mixed : string | number
 >         : ^^^^^^^^^^^^^^^
 >mixed : (string | number)[]
@@ -200,8 +200,8 @@ prefix("c", ...tuple)
 >                      : ^^^^
 >prefix : (s: string, a?: number, b?: number) => void
 >       : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    
->"c" : string
->    : ^^^^^^
+>"c" : "c"
+>    : ^^^
 >...tuple : string | number
 >         : ^^^^^^^^^^^^^^^
 >tuple : [number, string]
@@ -212,8 +212,8 @@ rest("e", ...mixed)
 >                    : ^^^^
 >rest : (s: string, a?: number, b?: number, ...rest: number[]) => void
 >     : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    ^^        ^^^^^    
->"e" : string
->    : ^^^^^^
+>"e" : "e"
+>    : ^^^
 >...mixed : string | number
 >         : ^^^^^^^^^^^^^^^
 >mixed : (string | number)[]
@@ -224,8 +224,8 @@ rest("f", ...tuple)
 >                    : ^^^^
 >rest : (s: string, a?: number, b?: number, ...rest: number[]) => void
 >     : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    ^^        ^^^^^    
->"f" : string
->    : ^^^^^^
+>"f" : "f"
+>    : ^^^
 >...tuple : string | number
 >         : ^^^^^^^^^^^^^^^
 >tuple : [number, string]
@@ -266,8 +266,8 @@ prefix2("g", ...ns);
 >                    : ^^^^
 >prefix2 : (s: string, n: number, a?: number, b?: number) => void
 >        : ^ ^^      ^^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^    
->"g" : string
->    : ^^^^^^
+>"g" : "g"
+>    : ^^^
 >...ns : number
 >      : ^^^^^^
 >ns : number[]
diff --git a/tests/baselines/reference/callWithSpread3.types b/tests/baselines/reference/callWithSpread3.types
index 3610651d00b..e5b6154edc0 100644
--- a/tests/baselines/reference/callWithSpread3.types
+++ b/tests/baselines/reference/callWithSpread3.types
@@ -73,8 +73,8 @@ fs2('a', ...s2); // error on ...s2
 >                : ^^^^
 >fs2 : (a: string, b: string) => void
 >    : ^ ^^      ^^ ^^      ^^^^^    
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >...s2 : string
 >      : ^^^^^^
 >s2 : [string, string]
@@ -85,10 +85,10 @@ fs2('a', 'b', 'c', ...s2); // error on 'c' and ...s2
 >                          : ^^^^
 >fs2 : (a: string, b: string) => void
 >    : ^ ^^      ^^ ^^      ^^^^^    
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 >'c' : "c"
 >    : ^^^
 >...s2 : string
@@ -101,10 +101,10 @@ fs2('a', 'b', ...s2, 'c'); // error on ...s2 and 'c'
 >                          : ^^^^
 >fs2 : (a: string, b: string) => void
 >    : ^ ^^      ^^ ^^      ^^^^^    
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 >...s2 : string
 >      : ^^^^^^
 >s2 : [string, string]
@@ -117,10 +117,10 @@ fs2('a', 'b', 'c', ...s2, 'd'); // error on 'c', ...s2 and 'd'
 >                               : ^^^^
 >fs2 : (a: string, b: string) => void
 >    : ^ ^^      ^^ ^^      ^^^^^    
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 >'c' : "c"
 >    : ^^^
 >...s2 : string
@@ -298,8 +298,8 @@ fs5(...s2, "foo", ...s2);
 >      : ^^^^^^
 >s2 : [string, string]
 >   : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >...s2 : string
 >      : ^^^^^^
 >s2 : [string, string]
diff --git a/tests/baselines/reference/callWithSpreadES6.types b/tests/baselines/reference/callWithSpreadES6.types
index 97174c12e5e..95d2e7a06ea 100644
--- a/tests/baselines/reference/callWithSpreadES6.types
+++ b/tests/baselines/reference/callWithSpreadES6.types
@@ -45,22 +45,22 @@ foo(1, 2, "abc");
 >                 : ^^^^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 foo(1, 2, ...a);
 >foo(1, 2, ...a) : void
 >                : ^^^^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -71,16 +71,16 @@ foo(1, 2, ...a, "abc");
 >                       : ^^^^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 obj.foo(1, 2, "abc");
 >obj.foo(1, 2, "abc") : any
@@ -90,12 +90,12 @@ obj.foo(1, 2, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 obj.foo(1, 2, ...a);
 >obj.foo(1, 2, ...a) : any
@@ -105,10 +105,10 @@ obj.foo(1, 2, ...a);
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -122,16 +122,16 @@ obj.foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 (obj.foo)(1, 2, "abc");
 >(obj.foo)(1, 2, "abc") : any
@@ -143,12 +143,12 @@ obj.foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 (obj.foo)(1, 2, ...a);
 >(obj.foo)(1, 2, ...a) : any
@@ -160,10 +160,10 @@ obj.foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -179,16 +179,16 @@ obj.foo(1, 2, ...a, "abc");
 >    : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 xa[1].foo(1, 2, "abc");
 >xa[1].foo(1, 2, "abc") : any
@@ -202,12 +202,12 @@ xa[1].foo(1, 2, "abc");
 >  : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"abc" : "abc"
+>      : ^^^^^
 
 xa[1].foo(1, 2, ...a);
 >xa[1].foo(1, 2, ...a) : any
@@ -221,10 +221,10 @@ xa[1].foo(1, 2, ...a);
 >  : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -242,16 +242,16 @@ xa[1].foo(1, 2, ...a, "abc");
 >  : ^
 >foo : (x: number, y: number, ...z: string[]) => any
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 (<Function>xa[1].foo)(...[1, 2, "abc"]);
 >(<Function>xa[1].foo)(...[1, 2, "abc"]) : any
@@ -348,20 +348,20 @@ class D extends C {
 >            : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
         super(1, 2, ...a);
 >super(1, 2, ...a) : void
 >                  : ^^^^
 >super : typeof C
 >      : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -380,10 +380,10 @@ class D extends C {
 >      : ^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
         super.foo(1, 2, ...a);
 >super.foo(1, 2, ...a) : void
@@ -394,10 +394,10 @@ class D extends C {
 >      : ^
 >foo : (x: number, y: number, ...z: string[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
diff --git a/tests/baselines/reference/callbackTag2.types b/tests/baselines/reference/callbackTag2.types
index c3de0e6257e..735b1652e72 100644
--- a/tests/baselines/reference/callbackTag2.types
+++ b/tests/baselines/reference/callbackTag2.types
@@ -20,8 +20,8 @@ var one_twenty = s => "120";
 >           : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"120" : string
->      : ^^^^^^
+>"120" : "120"
+>      : ^^^^^
 
 /** @template S
  * @callback SharedId
diff --git a/tests/baselines/reference/callbackTag3.types b/tests/baselines/reference/callbackTag3.types
index 548e4cdcf90..70828e0abb1 100644
--- a/tests/baselines/reference/callbackTag3.types
+++ b/tests/baselines/reference/callbackTag3.types
@@ -10,7 +10,7 @@ var sid = () => "!";
 >    : ^^^^^^^
 >() => "!" : () => string
 >          : ^^^^^^^^^^^^
->"!" : string
->    : ^^^^^^
+>"!" : "!"
+>    : ^^^
 
 
diff --git a/tests/baselines/reference/callbackTagNamespace.types b/tests/baselines/reference/callbackTagNamespace.types
index 27633136270..cde356b407a 100644
--- a/tests/baselines/reference/callbackTagNamespace.types
+++ b/tests/baselines/reference/callbackTagNamespace.types
@@ -21,7 +21,7 @@ function f(space, peace) {
 >peace : any
 
     return '1'
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/callbackTagNestedParameter.types b/tests/baselines/reference/callbackTagNestedParameter.types
index d25cf5a4557..a273ab902d2 100644
--- a/tests/baselines/reference/callbackTagNestedParameter.types
+++ b/tests/baselines/reference/callbackTagNestedParameter.types
@@ -29,7 +29,7 @@ function eachPerson(callback) {
 >                  : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Empty" : string
->        : ^^^^^^
+>"Empty" : "Empty"
+>        : ^^^^^^^
 }
 
diff --git a/tests/baselines/reference/callbackTagVariadicType.types b/tests/baselines/reference/callbackTagVariadicType.types
index 8ece52c46d0..d2452f74c2d 100644
--- a/tests/baselines/reference/callbackTagVariadicType.types
+++ b/tests/baselines/reference/callbackTagVariadicType.types
@@ -13,8 +13,8 @@ export const x = () => 1
 >  : ^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var res = x('a', 'b')
 >res : number
@@ -23,8 +23,8 @@ var res = x('a', 'b')
 >            : ^^^^^^
 >x : Foo
 >  : ^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 
diff --git a/tests/baselines/reference/callsOnComplexSignatures.types b/tests/baselines/reference/callsOnComplexSignatures.types
index 9a278197fd0..a9a9805eb55 100644
--- a/tests/baselines/reference/callsOnComplexSignatures.types
+++ b/tests/baselines/reference/callsOnComplexSignatures.types
@@ -102,8 +102,8 @@ function test2() {
 >                   : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^
 >options : { [key: string]: any; b: number; }
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"Foo" : string
->      : ^^^^^^
+>"Foo" : "Foo"
+>      : ^^^^^
 
         bar: (options) => "Bar",
 >bar : (options: { [key: string]: any; a: string; }) => string
@@ -112,8 +112,8 @@ function test2() {
 >                   : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^
 >options : { [key: string]: any; a: string; }
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"Bar" : string
->      : ^^^^^^
+>"Bar" : "Bar"
+>      : ^^^^^
 
     };
 
@@ -138,12 +138,12 @@ function test2() {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"A" : string
->    : ^^^^^^
+>"A" : "A"
+>    : ^^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function test3(items: string[] | number[]) {
@@ -289,12 +289,12 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg1({x: 0, y: 0}, {x: 1, y: 1});
 >arg1({x: 0, y: 0}, {x: 1, y: 1}) : number
@@ -305,22 +305,22 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 1, y: 1} : { x: number; y: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     arg2({x: 0}, {x: 0});
 >arg2({x: 0}, {x: 0}) : number
@@ -331,14 +331,14 @@ function test4(
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0} : { x: number; }
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg3({x: 0});
 >arg3({x: 0}) : number
@@ -349,8 +349,8 @@ function test4(
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg3({x: 0}, {x: 0, y: 0});
 >arg3({x: 0}, {x: 0, y: 0}) : number
@@ -361,18 +361,18 @@ function test4(
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0, y: 0} : { x: number; y: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg3({x: 0}, {x: 0, y: 0}, {x: 0, y: 0});
 >arg3({x: 0}, {x: 0, y: 0}, {x: 0, y: 0}) : number
@@ -383,28 +383,28 @@ function test4(
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0, y: 0} : { x: number; y: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0, y: 0} : { x: number; y: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg4();
 >arg4() : number
@@ -421,12 +421,12 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg4({x: 0, y: 0}, {x: 0});
 >arg4({x: 0, y: 0}, {x: 0}) : number
@@ -437,18 +437,18 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0} : { x: number; }
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg5();
 >arg5() : number
@@ -465,12 +465,12 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg5({x: 0, y: 0}, {x: 0});
 >arg5({x: 0, y: 0}, {x: 0}) : number
@@ -481,18 +481,18 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0} : { x: number; }
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg6();
 >arg6() : number
@@ -509,12 +509,12 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg6({x: 0, y: 0}, {x: 0, y: 0});
 >arg6({x: 0, y: 0}, {x: 0, y: 0}) : number
@@ -525,22 +525,22 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0, y: 0} : { x: number; y: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arg6({x: 0, y: 0}, {x: 0, y: 0}, {y: 0});
 >arg6({x: 0, y: 0}, {x: 0, y: 0}, {y: 0}) : number
@@ -551,28 +551,28 @@ function test4(
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{x: 0, y: 0} : { x: number; y: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{y: 0} : { y: number; }
 >       : ^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 // JSX Tag names
diff --git a/tests/baselines/reference/cannotIndexGenericWritingError.types b/tests/baselines/reference/cannotIndexGenericWritingError.types
index aa5c6ce29f2..a0d863bc409 100644
--- a/tests/baselines/reference/cannotIndexGenericWritingError.types
+++ b/tests/baselines/reference/cannotIndexGenericWritingError.types
@@ -47,14 +47,14 @@ function foo2<T extends number[] & { [s: string]: number | string }>(target: T,
 >  : ^
 
     target[1] = 1; // ok
->target[1] = 1 : number
->              : ^^^^^^
+>target[1] = 1 : 1
+>              : ^
 >target[1] : number
 >          : ^^^^^^
 >target : T
 >       : ^
 >1 : 1
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.types b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.types
index b0199c57d6e..2137b7639ab 100644
--- a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.types
+++ b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.types
@@ -12,8 +12,8 @@ class A {
 	public blah(): string { return ""; }
 >blah : () => string
 >     : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class B extends A {
diff --git a/tests/baselines/reference/capturedLetConstInLoop13.types b/tests/baselines/reference/capturedLetConstInLoop13.types
index 9ed3b8bc99d..96d3ac55999 100644
--- a/tests/baselines/reference/capturedLetConstInLoop13.types
+++ b/tests/baselines/reference/capturedLetConstInLoop13.types
@@ -15,12 +15,12 @@ class Main {
 >     : ^^^^
 >register : (...names: string[]) => void
 >         : ^^^^     ^^        ^^^^^    
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
     }
 
     private register(...names: string[]): void {
diff --git a/tests/baselines/reference/castTest.types b/tests/baselines/reference/castTest.types
index 400282f8caa..fd605be141f 100644
--- a/tests/baselines/reference/castTest.types
+++ b/tests/baselines/reference/castTest.types
@@ -39,8 +39,8 @@ var s = <string>"";
 >  : ^^^^^^
 ><string>"" : string
 >           : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var ar = <any[]>null;
 >ar : any[]
@@ -102,14 +102,14 @@ var p_cast = <Point> ({
     x: 0,
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     y: 0,
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     add: function(dx, dy) {
 >add : (dx: number, dy: number) => Point
diff --git a/tests/baselines/reference/castingTuple.types b/tests/baselines/reference/castingTuple.types
index 94f252e0570..55c4753184f 100644
--- a/tests/baselines/reference/castingTuple.types
+++ b/tests/baselines/reference/castingTuple.types
@@ -56,10 +56,10 @@ var numStrTuple: [number, string] = [5, "foo"];
 >            : ^^^^^^^^^^^^^^^^
 >[5, "foo"] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>5 : 5
+>  : ^
+>"foo" : "foo"
+>      : ^^^^^
 
 var emptyObjTuple = <[{}, {}]>numStrTuple;
 >emptyObjTuple : [{}, {}]
@@ -186,8 +186,8 @@ var unionTuple: [C, string | number] = [new C(), "foo"];
 >        : ^
 >C : typeof C
 >  : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 var unionTuple2: [C, string | number, D] = [new C(), "foo", new D()];
 >unionTuple2 : [C, string | number, D]
@@ -198,8 +198,8 @@ var unionTuple2: [C, string | number, D] = [new C(), "foo", new D()];
 >        : ^
 >C : typeof C
 >  : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >new D() : D
 >        : ^
 >D : typeof D
@@ -210,10 +210,10 @@ var unionTuple3: [number, string| number] = [10, "foo"];
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[10, "foo"] : [number, string]
 >            : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>10 : 10
+>   : ^^
+>"foo" : "foo"
+>      : ^^^^^
 
 var unionTuple4 = <[number, number]>unionTuple3; 
 >unionTuple4 : [number, number]
diff --git a/tests/baselines/reference/cf.types b/tests/baselines/reference/cf.types
index cc13121722c..eff12a94eef 100644
--- a/tests/baselines/reference/cf.types
+++ b/tests/baselines/reference/cf.types
@@ -52,12 +52,12 @@ function f() {
 >   : ^^^
 
             x=11;
->x=11 : number
->     : ^^^^^^
+>x=11 : 11
+>     : ^^
 >x : number
 >  : ^^^^^^
->11 : number
->   : ^^^^^^
+>11 : 11
+>   : ^^
         }
         if (y==3) {
 >y==3 : boolean
@@ -99,12 +99,12 @@ function f() {
 
                 break;
                 x=12;
->x=12 : number
->     : ^^^^^^
+>x=12 : 12
+>     : ^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
             }
         } while (y<41);
 >y<41 : boolean
@@ -159,12 +159,12 @@ function f() {
 >   : ^^^
 
             x=13;
->x=13 : number
->     : ^^^^^^
+>x=13 : 13
+>     : ^^
 >x : number
 >  : ^^^^^^
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
         }
         else {
             break L3;
@@ -172,12 +172,12 @@ function f() {
 >   : ^^^
 
             x=14;
->x=14 : number
->     : ^^^^^^
+>x=14 : 14
+>     : ^^
 >x : number
 >  : ^^^^^^
->14 : number
->   : ^^^^^^
+>14 : 14
+>   : ^^
         }
     }
     catch (e) {
@@ -228,12 +228,12 @@ function f() {
         break;
     }
     for (k=0;k<10;k++) {
->k=0 : number
->    : ^^^^^^
+>k=0 : 0
+>    : ^
 >k : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >k<10 : boolean
 >     : ^^^^^^^
 >k : number
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
index 771cb403b66..3408e1ee7be 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
@@ -217,8 +217,8 @@ class Chain2<T extends I> {
         // Ok to go down the chain, check the constraint at the end.
         // Should get an error that we are assigning a string to a number
         (new Chain2(i)).then(ii => t).then(tt => s).value.x = "";
->(new Chain2(i)).then(ii => t).then(tt => s).value.x = "" : string
->                                                         : ^^^^^^
+>(new Chain2(i)).then(ii => t).then(tt => s).value.x = "" : ""
+>                                                         : ^^
 >(new Chain2(i)).then(ii => t).then(tt => s).value.x : number
 >                                                    : ^^^^^^
 >(new Chain2(i)).then(ii => t).then(tt => s).value : S
@@ -259,14 +259,14 @@ class Chain2<T extends I> {
 >      : ^
 >x : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         // Staying at T or S should keep the constraint.
         // Get an error when we assign a string to a number in both cases
         (new Chain2(i)).then(ii => t).then(tt => t).then(tt => t).then(tt => t).value.x = "";
->(new Chain2(i)).then(ii => t).then(tt => t).then(tt => t).then(tt => t).value.x = "" : string
->                                                                                     : ^^^^^^
+>(new Chain2(i)).then(ii => t).then(tt => t).then(tt => t).then(tt => t).value.x = "" : ""
+>                                                                                     : ^^
 >(new Chain2(i)).then(ii => t).then(tt => t).then(tt => t).then(tt => t).value.x : number
 >                                                                                : ^^^^^^
 >(new Chain2(i)).then(ii => t).then(tt => t).then(tt => t).then(tt => t).value : T
@@ -331,12 +331,12 @@ class Chain2<T extends I> {
 >      : ^
 >x : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         (new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value.x = "";
->(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value.x = "" : string
->                                                                                     : ^^^^^^
+>(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value.x = "" : ""
+>                                                                                     : ^^
 >(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value.x : number
 >                                                                                : ^^^^^^
 >(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value : S
@@ -401,8 +401,8 @@ class Chain2<T extends I> {
 >      : ^
 >x : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         return null;
     }
diff --git a/tests/baselines/reference/chainedPrototypeAssignment.types b/tests/baselines/reference/chainedPrototypeAssignment.types
index 387351d5d97..83b0ad49f6e 100644
--- a/tests/baselines/reference/chainedPrototypeAssignment.types
+++ b/tests/baselines/reference/chainedPrototypeAssignment.types
@@ -9,8 +9,8 @@ var mod = require('./mod');
 >                 : ^^^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->'./mod' : string
->        : ^^^^^^
+>'./mod' : "./mod"
+>        : ^^^^^^^
 
 var a = new mod.A()
 >a : A
@@ -45,7 +45,7 @@ a.m('nope')
 >  : ^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 b.m('not really')
@@ -57,8 +57,8 @@ b.m('not really')
 >  : ^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->'not really' : string
->             : ^^^^^^
+>'not really' : "not really"
+>             : ^^^^^^^^^^^^
 
 === types.d.ts ===
 declare function require(name: string): any;
diff --git a/tests/baselines/reference/checkExportsObjectAssignProperty.types b/tests/baselines/reference/checkExportsObjectAssignProperty.types
index 3dec9e37716..36a76a895f1 100644
--- a/tests/baselines/reference/checkExportsObjectAssignProperty.types
+++ b/tests/baselines/reference/checkExportsObjectAssignProperty.types
@@ -49,40 +49,40 @@ m1.setonlyAccessor;
 
 // allowed assignments
 m1.thing = 10;
->m1.thing = 10 : number
->              : ^^^^^^
+>m1.thing = 10 : 10
+>              : ^^
 >m1.thing : number
 >         : ^^^^^^
 >m1 : typeof m1
 >   : ^^^^^^^^^
 >thing : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 m1.rwAccessors = 11;
->m1.rwAccessors = 11 : number
->                    : ^^^^^^
+>m1.rwAccessors = 11 : 11
+>                    : ^^
 >m1.rwAccessors : number
 >               : ^^^^^^
 >m1 : typeof m1
 >   : ^^^^^^^^^
 >rwAccessors : number
 >            : ^^^^^^
->11 : number
->   : ^^^^^^
+>11 : 11
+>   : ^^
 
 m1.setonlyAccessor = "yes";
->m1.setonlyAccessor = "yes" : string
->                           : ^^^^^^
+>m1.setonlyAccessor = "yes" : "yes"
+>                           : ^^^^^
 >m1.setonlyAccessor : string
 >                   : ^^^^^^
 >m1 : typeof m1
 >   : ^^^^^^^^^
 >setonlyAccessor : string
 >                : ^^^^^^
->"yes" : string
->      : ^^^^^^
+>"yes" : "yes"
+>      : ^^^^^
 
 // disallowed assignments
 m1.readonlyProp = "name";
@@ -110,40 +110,40 @@ m1.readonlyAccessor = 12;
 >   : ^^
 
 m1.thing = "no";
->m1.thing = "no" : string
->                : ^^^^^^
+>m1.thing = "no" : "no"
+>                : ^^^^
 >m1.thing : number
 >         : ^^^^^^
 >m1 : typeof m1
 >   : ^^^^^^^^^
 >thing : number
 >      : ^^^^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
 m1.rwAccessors = "no";
->m1.rwAccessors = "no" : string
->                      : ^^^^^^
+>m1.rwAccessors = "no" : "no"
+>                      : ^^^^
 >m1.rwAccessors : number
 >               : ^^^^^^
 >m1 : typeof m1
 >   : ^^^^^^^^^
 >rwAccessors : number
 >            : ^^^^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
 m1.setonlyAccessor = 0;
->m1.setonlyAccessor = 0 : number
->                       : ^^^^^^
+>m1.setonlyAccessor = 0 : 0
+>                       : ^
 >m1.setonlyAccessor : string
 >                   : ^^^^^^
 >m1 : typeof m1
 >   : ^^^^^^^^^
 >setonlyAccessor : string
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 import m2 = require("./mod2");
 >m2 : typeof m2
@@ -191,40 +191,40 @@ m2.setonlyAccessor;
 
 // allowed assignments
 m2.thing = "ok";
->m2.thing = "ok" : string
->                : ^^^^^^
+>m2.thing = "ok" : "ok"
+>                : ^^^^
 >m2.thing : string
 >         : ^^^^^^
 >m2 : typeof m2
 >   : ^^^^^^^^^
 >thing : string
 >      : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 
 m2.rwAccessors = 11;
->m2.rwAccessors = 11 : number
->                    : ^^^^^^
+>m2.rwAccessors = 11 : 11
+>                    : ^^
 >m2.rwAccessors : number
 >               : ^^^^^^
 >m2 : typeof m2
 >   : ^^^^^^^^^
 >rwAccessors : number
 >            : ^^^^^^
->11 : number
->   : ^^^^^^
+>11 : 11
+>   : ^^
 
 m2.setonlyAccessor = "yes";
->m2.setonlyAccessor = "yes" : string
->                           : ^^^^^^
+>m2.setonlyAccessor = "yes" : "yes"
+>                           : ^^^^^
 >m2.setonlyAccessor : string
 >                   : ^^^^^^
 >m2 : typeof m2
 >   : ^^^^^^^^^
 >setonlyAccessor : string
 >                : ^^^^^^
->"yes" : string
->      : ^^^^^^
+>"yes" : "yes"
+>      : ^^^^^
 
 // disallowed assignments
 m2.readonlyProp = "name";
@@ -252,40 +252,40 @@ m2.readonlyAccessor = 12;
 >   : ^^
 
 m2.thing = 0;
->m2.thing = 0 : number
->             : ^^^^^^
+>m2.thing = 0 : 0
+>             : ^
 >m2.thing : string
 >         : ^^^^^^
 >m2 : typeof m2
 >   : ^^^^^^^^^
 >thing : string
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 m2.rwAccessors = "no";
->m2.rwAccessors = "no" : string
->                      : ^^^^^^
+>m2.rwAccessors = "no" : "no"
+>                      : ^^^^
 >m2.rwAccessors : number
 >               : ^^^^^^
 >m2 : typeof m2
 >   : ^^^^^^^^^
 >rwAccessors : number
 >            : ^^^^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
 m2.setonlyAccessor = 0;
->m2.setonlyAccessor = 0 : number
->                       : ^^^^^^
+>m2.setonlyAccessor = 0 : 0
+>                       : ^
 >m2.setonlyAccessor : string
 >                   : ^^^^^^
 >m2 : typeof m2
 >   : ^^^^^^^^^
 >setonlyAccessor : string
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 === mod1.js ===
 Object.defineProperty(exports, "thing", { value: 42, writable: true });
diff --git a/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types b/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
index 0ee95ef2de4..fa8d4979235 100644
--- a/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
+++ b/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
@@ -14,7 +14,7 @@ const m1 = new Person("Name")
 >                   : ^^^^^^
 >Person : typeof Person
 >       : ^^^^^^^^^^^^^
->"Name" : string
+>"Name" : "Name"
 >       : ^^^^^^
 
 m1.thing;
@@ -59,40 +59,40 @@ m1.setonlyAccessor;
 
 // allowed assignments
 m1.thing = 10;
->m1.thing = 10 : number
->              : ^^^^^^
+>m1.thing = 10 : 10
+>              : ^^
 >m1.thing : number
 >         : ^^^^^^
 >m1 : Person
 >   : ^^^^^^
 >thing : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 m1.rwAccessors = 11;
->m1.rwAccessors = 11 : number
->                    : ^^^^^^
+>m1.rwAccessors = 11 : 11
+>                    : ^^
 >m1.rwAccessors : number
 >               : ^^^^^^
 >m1 : Person
 >   : ^^^^^^
 >rwAccessors : number
 >            : ^^^^^^
->11 : number
->   : ^^^^^^
+>11 : 11
+>   : ^^
 
 m1.setonlyAccessor = "yes";
->m1.setonlyAccessor = "yes" : string
->                           : ^^^^^^
+>m1.setonlyAccessor = "yes" : "yes"
+>                           : ^^^^^
 >m1.setonlyAccessor : string
 >                   : ^^^^^^
 >m1 : Person
 >   : ^^^^^^
 >setonlyAccessor : string
 >                : ^^^^^^
->"yes" : string
->      : ^^^^^^
+>"yes" : "yes"
+>      : ^^^^^
 
 // disallowed assignments
 m1.readonlyProp = "name";
@@ -120,40 +120,40 @@ m1.readonlyAccessor = 12;
 >   : ^^
 
 m1.thing = "no";
->m1.thing = "no" : string
->                : ^^^^^^
+>m1.thing = "no" : "no"
+>                : ^^^^
 >m1.thing : number
 >         : ^^^^^^
 >m1 : Person
 >   : ^^^^^^
 >thing : number
 >      : ^^^^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
 m1.rwAccessors = "no";
->m1.rwAccessors = "no" : string
->                      : ^^^^^^
+>m1.rwAccessors = "no" : "no"
+>                      : ^^^^
 >m1.rwAccessors : number
 >               : ^^^^^^
 >m1 : Person
 >   : ^^^^^^
 >rwAccessors : number
 >            : ^^^^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
 m1.setonlyAccessor = 0;
->m1.setonlyAccessor = 0 : number
->                       : ^^^^^^
+>m1.setonlyAccessor = 0 : 0
+>                       : ^
 >m1.setonlyAccessor : string
 >                   : ^^^^^^
 >m1 : Person
 >   : ^^^^^^
 >setonlyAccessor : string
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
 === mod1.js ===
diff --git a/tests/baselines/reference/checkJsFiles.types b/tests/baselines/reference/checkJsFiles.types
index a05945d8af7..2bd0d229ce8 100644
--- a/tests/baselines/reference/checkJsFiles.types
+++ b/tests/baselines/reference/checkJsFiles.types
@@ -8,10 +8,10 @@ var x = "string";
 >         : ^^^^^^^^
 
 x = 0;
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsFiles2.types b/tests/baselines/reference/checkJsFiles2.types
index 9d8beee9fa9..b1e300c95ce 100644
--- a/tests/baselines/reference/checkJsFiles2.types
+++ b/tests/baselines/reference/checkJsFiles2.types
@@ -9,10 +9,10 @@ var x = "string";
 >         : ^^^^^^^^
 
 x = 0;
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsFiles3.types b/tests/baselines/reference/checkJsFiles3.types
index 301dc844748..df04839ae9a 100644
--- a/tests/baselines/reference/checkJsFiles3.types
+++ b/tests/baselines/reference/checkJsFiles3.types
@@ -9,10 +9,10 @@ var x = "string";
 >         : ^^^^^^^^
 
 x = 0;
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsFiles4.types b/tests/baselines/reference/checkJsFiles4.types
index e464e56b483..4ad8e5e9603 100644
--- a/tests/baselines/reference/checkJsFiles4.types
+++ b/tests/baselines/reference/checkJsFiles4.types
@@ -9,10 +9,10 @@ var x = "string";
 >         : ^^^^^^^^
 
 x = 0;
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsFiles5.types b/tests/baselines/reference/checkJsFiles5.types
index cc00f6ea9b6..f3d32c4c71c 100644
--- a/tests/baselines/reference/checkJsFiles5.types
+++ b/tests/baselines/reference/checkJsFiles5.types
@@ -9,10 +9,10 @@ var x = "string";
 >         : ^^^^^^^^
 
 x = 0;
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocParamTag1.types b/tests/baselines/reference/checkJsdocParamTag1.types
index eae23c9ef84..22ca3c84b72 100644
--- a/tests/baselines/reference/checkJsdocParamTag1.types
+++ b/tests/baselines/reference/checkJsdocParamTag1.types
@@ -25,16 +25,16 @@ foo(1);
 >       : ^^^^
 >foo : (n?: number | undefined, s?: string) => void
 >    : ^ ^^^         ^^^^^^^^^^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo(1, "hi");
 >foo(1, "hi") : void
 >             : ^^^^
 >foo : (n?: number | undefined, s?: string) => void
 >    : ^ ^^^         ^^^^^^^^^^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>1 : 1
+>  : ^
+>"hi" : "hi"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/checkJsdocReturnTag1.types b/tests/baselines/reference/checkJsdocReturnTag1.types
index 99211bfa0af..86d982813fb 100644
--- a/tests/baselines/reference/checkJsdocReturnTag1.types
+++ b/tests/baselines/reference/checkJsdocReturnTag1.types
@@ -10,8 +10,8 @@ function f() {
 >  : ^^^^^^      
 
     return "hello";
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 /**
@@ -22,8 +22,8 @@ function f1() {
 >   : ^^^^^^         ^^^^^^^^^
 
     return "hello world";
->"hello world" : string
->              : ^^^^^^
+>"hello world" : "hello world"
+>              : ^^^^^^^^^^^^^
 }
 
 /**
@@ -34,11 +34,11 @@ function f2() {
 >   : ^^^^^^               
 
     return 5 || "hello";
->5 || "hello" : string | number
->             : ^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>5 || "hello" : "hello" | 5
+>             : ^^^^^^^^^^^
+>5 : 5
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.errors.txt b/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
index 3abedfcce34..1af147cc8fa 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
+++ b/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
@@ -1,5 +1,5 @@
 returns.js(6,5): error TS2322: Type 'number' is not assignable to type 'string'.
-returns.js(13,5): error TS2322: Type 'number | true' is not assignable to type 'string | number'.
+returns.js(13,5): error TS2322: Type 'number | boolean' is not assignable to type 'string | number'.
   Type 'boolean' is not assignable to type 'string | number'.
 
 
@@ -20,7 +20,7 @@ returns.js(13,5): error TS2322: Type 'number | true' is not assignable to type '
     function f1() {
         return 5 || true;
         ~~~~~~
-!!! error TS2322: Type 'number | true' is not assignable to type 'string | number'.
+!!! error TS2322: Type 'number | boolean' is not assignable to type 'string | number'.
 !!! error TS2322:   Type 'boolean' is not assignable to type 'string | number'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.types b/tests/baselines/reference/checkJsdocReturnTag2.types
index 5d1a2b887a7..eb45cf3aad7 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.types
+++ b/tests/baselines/reference/checkJsdocReturnTag2.types
@@ -10,8 +10,8 @@ function f() {
 >  : ^^^^^^      
 
     return 5;
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 }
 
 /**
@@ -22,10 +22,10 @@ function f1() {
 >   : ^^^^^^               
 
     return 5 || true;
->5 || true : number | true
->          : ^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 || true : true | 5
+>          : ^^^^^^^^
+>5 : 5
+>  : ^
 >true : true
 >     : ^^^^
 }
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag1.types b/tests/baselines/reference/checkJsdocSatisfiesTag1.types
index 1f51a4f5b9c..93b3d1df278 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag1.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag1.types
@@ -29,8 +29,8 @@ const t1 = /** @satisfies {T1} */ ({ a: 1 });
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const t2 = /** @satisfies {T1} */ ({ a: 1, b: 1 });
 >t2 : { a: number; b: number; }
@@ -41,8 +41,8 @@ const t2 = /** @satisfies {T1} */ ({ a: 1, b: 1 });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
 >1 : 1
@@ -87,8 +87,8 @@ const t5 = /** @satisfies {T3} */((m) => m.substring(0));
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const t6 = /** @satisfies {[number, number]} */ ([1, 2]);
 >t6 : [number, number]
@@ -97,10 +97,10 @@ const t6 = /** @satisfies {[number, number]} */ ([1, 2]);
 >         : ^^^^^^^^^^^^^^^^
 >[1, 2] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 const t7 = /** @satisfies {T4} */ ({ a: 'test' });
 >t7 : { a: string; }
@@ -111,7 +111,7 @@ const t7 = /** @satisfies {T4} */ ({ a: 'test' });
 >              : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 const t8 = /** @satisfies {T4} */ ({ a: 'test', b: 'test' });
@@ -123,7 +123,7 @@ const t8 = /** @satisfies {T4} */ ({ a: 'test', b: 'test' });
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 >b : string
 >  : ^^^^^^
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag10.types b/tests/baselines/reference/checkJsdocSatisfiesTag10.types
index 70cf5c66340..21f87c36759 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag10.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag10.types
@@ -14,14 +14,14 @@ const p = /** @satisfies {Partial<Record<Keys, unknown>>} */ ({
     a: 0,
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b: "hello",
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x: 8 // Should error, 'x' isn't in 'Keys'
 >x : number
@@ -63,8 +63,8 @@ let b = p.b.substring(1);
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Should error even though 'd' is in 'Keys'
 let d = p.d;
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag11.types b/tests/baselines/reference/checkJsdocSatisfiesTag11.types
index 5527e8e6e73..31a99e5fe2d 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag11.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag11.types
@@ -22,17 +22,17 @@ const t1 = { a: 1 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 /**
  * @satisfies {number}
  */
 const t2 = /** @satisfies {number} */ (1);
->t2 : number
->   : ^^^^^^
->(1) : number
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>t2 : 1
+>   : ^
+>(1) : 1
+>    : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag12.types b/tests/baselines/reference/checkJsdocSatisfiesTag12.types
index e628f559fb6..01e9be89dce 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag12.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag12.types
@@ -26,8 +26,8 @@ const t1 = { a: 1 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 /**
  * @satisfies {T1}
@@ -39,8 +39,8 @@ const t2 = { a: 1, b: 1 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
 >1 : 1
@@ -63,10 +63,10 @@ const t4 = [1, 2];
 >   : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 /**
  * @satisfies {T2}
@@ -78,7 +78,7 @@ const t5 = { a: 'test' };
 >              : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 /**
@@ -91,7 +91,7 @@ const t6 = { a: 'test', b: 'test' };
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 >b : string
 >  : ^^^^^^
@@ -112,10 +112,10 @@ const t7 = { a: "a" };
 >    : ^^^
 
 /** @satisfies {string} */ const t8 = (1);
->t8 : number
->   : ^^^^^^
->(1) : number
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>t8 : 1
+>   : ^
+>(1) : 1
+>    : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag14.types b/tests/baselines/reference/checkJsdocSatisfiesTag14.types
index 8d5f7438308..61fc3ec1a71 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag14.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag14.types
@@ -16,8 +16,8 @@ const t1 = { a: 1 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const t2 = /** @satisfies T1 */ ({ a: 1 });
 >t2 : { a: number; }
@@ -28,6 +28,6 @@ const t2 = /** @satisfies T1 */ ({ a: 1 });
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag4.types b/tests/baselines/reference/checkJsdocSatisfiesTag4.types
index b87b5bfa4f3..f438d98fb24 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag4.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag4.types
@@ -24,6 +24,6 @@ export default /** @satisfies {Foo} */ ({ a: 1 });
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag6.types b/tests/baselines/reference/checkJsdocSatisfiesTag6.types
index fbe42e8d0c1..65d63e0795b 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag6.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag6.types
@@ -17,8 +17,8 @@ const a = /** @satisfies {Partial<Point2d>} */ ({ x: 10 });
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 // Should OK
 console.log(a.x.toFixed());
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag7.types b/tests/baselines/reference/checkJsdocSatisfiesTag7.types
index 72f9ed9dafc..ea9bae04965 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag7.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag7.types
@@ -14,14 +14,14 @@ const p = /** @satisfies {Record<Keys, unknown>} */ ({
     a: 0,
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b: "hello",
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x: 8 // Should error, 'x' isn't in 'Keys'
 >x : number
@@ -63,8 +63,8 @@ let b = p.b.substring(1);
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Should error even though 'd' is in 'Keys'
 let d = p.d;
diff --git a/tests/baselines/reference/checkJsdocSatisfiesTag9.types b/tests/baselines/reference/checkJsdocSatisfiesTag9.types
index 1831493eb51..100a47ac583 100644
--- a/tests/baselines/reference/checkJsdocSatisfiesTag9.types
+++ b/tests/baselines/reference/checkJsdocSatisfiesTag9.types
@@ -24,16 +24,16 @@ export const Palette = /** @satisfies {Record<string, Color>} */ ({
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >r : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 >g : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 >b : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 
     black: { r: 0, g: 0, d: 0 }, // <- oops! 'd' in place of 'b'
 >black : { r: number; g: number; d: number; }
@@ -42,12 +42,12 @@ export const Palette = /** @satisfies {Record<string, Color>} */ ({
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >r : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >g : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >d : number
 >  : ^^^^^^
 >0 : 0
@@ -60,16 +60,16 @@ export const Palette = /** @satisfies {Record<string, Color>} */ ({
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >r : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >g : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >b : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 
 });
 
diff --git a/tests/baselines/reference/checkJsdocTypeTag1.types b/tests/baselines/reference/checkJsdocTypeTag1.types
index 11bb2e95bd8..78b5455e241 100644
--- a/tests/baselines/reference/checkJsdocTypeTag1.types
+++ b/tests/baselines/reference/checkJsdocTypeTag1.types
@@ -6,15 +6,15 @@
 var S = "hello world";
 >S : string
 >  : ^^^^^^
->"hello world" : string
->              : ^^^^^^
+>"hello world" : "hello world"
+>              : ^^^^^^^^^^^^^
 
 /** @type {number} */
 var n = 10;
 >n : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 /** @type {*} */
 var anyT = 2;
@@ -112,8 +112,8 @@ x1(0);
 >      : ^^^
 >x1 : (arg0: number) => any
 >   : ^^^^^^^      ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {function (number): number} */
 const x2 = (a) => a + 1;
@@ -135,8 +135,8 @@ x2(0);
 >      : ^^^^^^
 >x2 : (arg0: number) => number
 >   : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /**
  * @type {object}
diff --git a/tests/baselines/reference/checkJsdocTypeTag2.types b/tests/baselines/reference/checkJsdocTypeTag2.types
index f5bdfe85a3b..3d89f42719c 100644
--- a/tests/baselines/reference/checkJsdocTypeTag2.types
+++ b/tests/baselines/reference/checkJsdocTypeTag2.types
@@ -13,8 +13,8 @@ var S = true;
 var n = "hello";
 >n : number
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 /** @type {function (number)} */
 const x1 = (a) => a + 1;
@@ -36,8 +36,8 @@ x1("string");
 >             : ^^^
 >x1 : (arg0: number) => any
 >   : ^^^^^^^      ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 /** @type {function (number): number} */
 const x2 = (a) => a + 1;
@@ -68,8 +68,8 @@ a = x2(0);
 >      : ^^^^^^
 >x2 : (arg0: number) => number
 >   : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {function (number): number} */
 const x3 = (a) => a.concat("hi");
@@ -95,8 +95,8 @@ x3(0);
 >      : ^^^^^^
 >x3 : (arg0: number) => number
 >   : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {function (number): string} */
 const x4 = (a) => a + 1;
@@ -118,6 +118,6 @@ x4(0);
 >      : ^^^^^^
 >x4 : (arg0: number) => string
 >   : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.types b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.types
index 6fa7b6a2dc9..4744b7c0c42 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.types
@@ -15,12 +15,12 @@ export default { a: 1, b: 1 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 === b.js ===
 import a from "./a";
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.types b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.types
index 5ad578bfc36..f807d291913 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.types
@@ -15,12 +15,12 @@ export default { a: 1, b: 1, c: 1 };
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
 >1 : 1
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment8.types b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment8.types
index 4d251113d9e..b6ca2ff1d4d 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment8.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment8.types
@@ -17,8 +17,8 @@ export default {
     a: 'a',
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
     b: 'b'
 >b : "b"
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
index 56c2151f6cd..f1f21010c71 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
@@ -25,8 +25,8 @@ const obj = {
   bar: "42",
 >bar : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"42" : string
->     : ^^^^^^
+>"42" : "42"
+>     : ^^^^
 
   /** @type {function(number): number} */
   method1(n1) {
@@ -59,8 +59,8 @@ const obj = {
 >    : ^^^
 >'ar1' : "ar1"
 >      : ^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
   /** @type {function(number): number} */
   arrowFunc: (num) => num + 42
@@ -120,8 +120,8 @@ var k = obj.method1(0);
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^      ^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^                  ^^^^^^^^^^^^^^^^      ^^^      ^^^^^^^      ^^^^^^^^^^^^^     ^^                 ^^^
 >method1 : (arg0: number) => number
 >        : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 obj.bar1 = "42";
 >obj.bar1 = "42" : "42"
@@ -144,6 +144,6 @@ obj.arrowFunc(0);
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^      ^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^                  ^^^^^^^^^^^^^^^^      ^^^      ^^^^^^^      ^^^^^^^^^^^^^     ^^                 ^^^
 >arrowFunc : (arg0: number) => number
 >          : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
index db806dbc871..6d1f1a0caef 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
@@ -16,8 +16,8 @@ const obj = {
   bar: 42,
 >bar : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
   /** @type {function(number): number} */
   method1(n1) {
@@ -27,8 +27,8 @@ const obj = {
 >   : ^^^^^^
 
       return "42";
->"42" : string
->     : ^^^^^^
+>"42" : "42"
+>     : ^^^^
 
   },
   /** @type {function(number): number} */
@@ -39,8 +39,8 @@ const obj = {
 >              : ^  ^^^^^^^^^^^^^      
 >n1 : number
 >   : ^^^^^^
->"lol" : string
->      : ^^^^^^
+>"lol" : "lol"
+>      : ^^^^^
 
   /** @type {function(number): number} */
   arrowFunc: (num="0") => num + 42,
@@ -50,8 +50,8 @@ const obj = {
 >                      : ^   ^^^^^^^^^^^^^^      
 >num : number
 >    : ^^^^^^
->"0" : string
->    : ^^^^^^
+>"0" : "0"
+>    : ^^^
 >num + 42 : number
 >         : ^^^^^^
 >num : number
@@ -84,8 +84,8 @@ var s = obj.method1(0);
 >    : ^^^^^^^                  ^^^^^^^^^^^^^^^^      ^^^      ^^^^^^^^^^^     ^^                 ^^^^^^^^^^^^^     ^^                 ^^^^^^^      ^^^
 >method1 : (arg0: number) => number
 >        : ^^^^^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {string} */
 var s1 = obj.method2("0");
@@ -99,6 +99,6 @@ var s1 = obj.method2("0");
 >    : ^^^^^^^                  ^^^^^^^^^^^^^^^^      ^^^      ^^^^^^^^^^^     ^^                 ^^^^^^^^^^^^^     ^^                 ^^^^^^^      ^^^
 >method2 : (arg0: number) => number
 >        : ^^^^^^^      ^^^^^      
->"0" : string
->    : ^^^^^^
+>"0" : "0"
+>    : ^^^
 
diff --git a/tests/baselines/reference/checkJsdocTypedefInParamTag1.types b/tests/baselines/reference/checkJsdocTypedefInParamTag1.types
index 4ab1698f34d..146b73a8ecb 100644
--- a/tests/baselines/reference/checkJsdocTypedefInParamTag1.types
+++ b/tests/baselines/reference/checkJsdocTypedefInParamTag1.types
@@ -35,8 +35,8 @@ foo({x: 'abc'});
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
 /**
  * @typedef {Object} AnotherOpts
@@ -69,8 +69,8 @@ foo1({anotherX: "world"});
 >                    : ^^^^^^^^^^^^^^^^^^^^^
 >anotherX : string
 >         : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 /**
  * @typedef {object} Opts1
@@ -104,6 +104,6 @@ foo2({x: 'abc'});
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.types b/tests/baselines/reference/checkJsxChildrenProperty1.types
index 919663fc57f..42eef8075c4 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.types
@@ -52,8 +52,8 @@ let k = <Comp a={10} b="hi" children ="lol" />;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >children : string
@@ -70,8 +70,8 @@ let k1 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -91,8 +91,8 @@ let k2 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.types b/tests/baselines/reference/checkJsxChildrenProperty14.types
index 4862505f563..462991d4777 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.types
@@ -95,8 +95,8 @@ let k1 = <Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><></> : JSX.Element
@@ -121,8 +121,8 @@ let k2 = <Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><><Button /></> : JSX.Element
@@ -147,8 +147,8 @@ let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><><Button /><AnotherButton /></> : JSX.Element
@@ -211,8 +211,8 @@ let k4 = <SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></Single
 >                : ^ ^^               ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><><Button /><AnotherButton /></> : JSX.Element
@@ -238,8 +238,8 @@ let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></Single
 >                : ^ ^^               ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><></> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.types b/tests/baselines/reference/checkJsxChildrenProperty2.types
index 7fb61d8f4eb..2107c6d54cb 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.types
@@ -52,8 +52,8 @@ let k = <Comp a={10} b="hi" />;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -68,8 +68,8 @@ let k0 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >children : string
@@ -103,8 +103,8 @@ let k1 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >o : { children: string; }
@@ -127,8 +127,8 @@ let k2 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -169,8 +169,8 @@ let k3 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -201,8 +201,8 @@ let k4 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -230,8 +230,8 @@ let k5 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.types b/tests/baselines/reference/checkJsxChildrenProperty5.types
index 6f5ce01b1de..e6548450aca 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.types
@@ -76,8 +76,8 @@ let k = <Comp a={10} b="hi" />;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -93,8 +93,8 @@ let k1 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -119,8 +119,8 @@ let k2 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.types b/tests/baselines/reference/checkJsxChildrenProperty6.types
index 39c832412de..ce5c43d4bdc 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.types
@@ -96,8 +96,8 @@ let k1 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -128,8 +128,8 @@ let k2 =
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
      
@@ -160,8 +160,8 @@ let k3 = <Comp a={10} b="hi"><Button />
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
@@ -188,8 +188,8 @@ let k4 = <Comp a={10} b="hi"><Button /></Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.types b/tests/baselines/reference/checkJsxChildrenProperty7.types
index 43e74e5b85d..fed71f80cf9 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.types
@@ -95,8 +95,8 @@ let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
@@ -119,8 +119,8 @@ let k2 = <Comp a={10} b="hi"><Button />
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
@@ -145,8 +145,8 @@ let k3 = <Comp a={10} b="hi">    <Button />
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.types b/tests/baselines/reference/checkJsxChildrenProperty8.types
index 2f9db142223..a0ad4905882 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.types
@@ -94,8 +94,8 @@ let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
@@ -118,8 +118,8 @@ let k2 = <Comp a={10} b="hi"><Button />
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
@@ -144,8 +144,8 @@ let k3 = <Comp a={10} b="hi">    <Button />
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
@@ -170,8 +170,8 @@ let k4 = <Comp a={10} b="hi"><Button />  </Comp>;
 >     : ^ ^^    ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 ><Button /> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
index 3b651c1b7ae..519b58df460 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
@@ -44,8 +44,8 @@ let a = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a} />; //
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 >nextValues : (a: { x: string; }) => { x: string; }
 >           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a => a : (a: { x: string; }) => { x: string; }
@@ -64,8 +64,8 @@ let b = <GenericComponent initialValues={12} nextValues={a => a} />; // No error
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >initialValues : number
 >              : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >nextValues : (a: number) => number
 >           : ^ ^^^^^^^^^^^^^^^^^^^
 >a => a : (a: number) => number
@@ -88,8 +88,8 @@ let c = <GenericComponent initialValues={{ x: "y" }} nextValues={a => ({ x: a.x
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 >nextValues : (a: { x: string; }) => { x: string; }
 >           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a => ({ x: a.x }) : (a: { x: string; }) => { x: string; }
@@ -122,8 +122,8 @@ let d = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a.x} />; /
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 >nextValues : (a: { x: string; }) => string
 >           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a => a.x : (a: { x: string; }) => string
diff --git a/tests/baselines/reference/checkJsxIntersectionElementPropsType.types b/tests/baselines/reference/checkJsxIntersectionElementPropsType.types
index 0631c607547..0a9c2b80045 100644
--- a/tests/baselines/reference/checkJsxIntersectionElementPropsType.types
+++ b/tests/baselines/reference/checkJsxIntersectionElementPropsType.types
@@ -39,8 +39,8 @@ const y = new C({foobar: "example"});
 >                    : ^^^^^^^^^^^^^^^^^^^
 >foobar : string
 >       : ^^^^^^
->"example" : string
->          : ^^^^^^
+>"example" : "example"
+>          : ^^^^^^^^^
 
 const x = <C foobar="example" />
 >x : error
diff --git a/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.types b/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.types
index 0953ff87434..82d01bf4f8e 100644
--- a/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.types
+++ b/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.types
@@ -88,8 +88,8 @@ export function HereIsTheError() {
             value={'s'}
 >value : string
 >      : ^^^^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
             onChange={val => console.log(val)} // <- this throws an error
 >onChange : (val: string | undefined) => void
@@ -131,8 +131,8 @@ ComponentWithUnion({
     value: 's',
 >value : string
 >      : ^^^^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
     onChange: val => console.log(val) // <- this works fine
 >onChange : (val: string | undefined) => void
diff --git a/tests/baselines/reference/checkObjectDefineProperty.types b/tests/baselines/reference/checkObjectDefineProperty.types
index b965c4121e1..aa7af57c042 100644
--- a/tests/baselines/reference/checkObjectDefineProperty.types
+++ b/tests/baselines/reference/checkObjectDefineProperty.types
@@ -55,40 +55,40 @@ x.zipStr;
 >       : ^^^^^^
 
 x.name = "Another";
->x.name = "Another" : string
->                   : ^^^^^^
+>x.name = "Another" : "Another"
+>                   : ^^^^^^^^^
 >x.name : string
 >       : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Another" : string
->          : ^^^^^^
+>"Another" : "Another"
+>          : ^^^^^^^^^
 
 x.zip = 98123;
->x.zip = 98123 : number
->              : ^^^^^^
+>x.zip = 98123 : 98123
+>              : ^^^^^
 >x.zip : number
 >      : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >zip : number
 >    : ^^^^^^
->98123 : number
->      : ^^^^^^
+>98123 : 98123
+>      : ^^^^^
 
 x.zipStr = "OK";
->x.zipStr = "OK" : string
->                : ^^^^^^
+>x.zipStr = "OK" : "OK"
+>                : ^^^^
 >x.zipStr : string
 >         : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >zipStr : string
 >       : ^^^^^^
->"OK" : string
->     : ^^^^^^
+>"OK" : "OK"
+>     : ^^^^
 
 x.lastName = "should fail";
 >x.lastName = "should fail" : "should fail"
@@ -115,16 +115,16 @@ x.houseNumber = 12; // should also fail
 >   : ^^
 
 x.zipStr = 12; // should fail
->x.zipStr = 12 : number
->              : ^^^^^^
+>x.zipStr = 12 : 12
+>              : ^^
 >x.zipStr : string
 >         : ^^^^^^
 >x : typeof x
 >  : ^^^^^^^^
 >zipStr : string
 >       : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 x.middleInit = "R"; // should also fail
 >x.middleInit = "R" : "R"
diff --git a/tests/baselines/reference/checkOtherObjectAssignProperty.types b/tests/baselines/reference/checkOtherObjectAssignProperty.types
index 09abbde0b2a..4e818ff29d8 100644
--- a/tests/baselines/reference/checkOtherObjectAssignProperty.types
+++ b/tests/baselines/reference/checkOtherObjectAssignProperty.types
@@ -61,16 +61,16 @@ mod.bad3;
 
 
 mod.thing = 0;
->mod.thing = 0 : number
->              : ^^^^^^
+>mod.thing = 0 : 0
+>              : ^
 >mod.thing : number
 >          : ^^^^^^
 >mod : typeof mod
 >    : ^^^^^^^^^^
 >thing : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 mod.other = 0;
 >mod.other = 0 : 0
@@ -171,8 +171,8 @@ let str = /** @type {string} */("other");
 >    : ^^^^^^
 >("other") : string
 >          : ^^^^^^
->"other" : string
->        : ^^^^^^
+>"other" : "other"
+>        : ^^^^^^^
 
 Object.defineProperty(exports, str, { value: 42, writable: true });
 >Object.defineProperty(exports, str, { value: 42, writable: true }) : typeof import("mod1")
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccess.types b/tests/baselines/reference/checkSuperCallBeforeThisAccess.types
index ced9ce8d207..4894e991c67 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccess.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccess.types
@@ -376,15 +376,15 @@ export class BarCorrectlyFails extends Foo {
 >            : ^^^^
 >super : typeof Foo
 >      : ^^^^^^^^^^
->1337 : number
->     : ^^^^^^
+>1337 : 1337
+>     : ^^^^
         }
     }
     bar(): number { return 4; }
 >bar : () => number
 >    : ^^^^^^      
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 }
 
 export class BarIncorrectlyWorks extends Foo {
@@ -406,8 +406,8 @@ export class BarIncorrectlyWorks extends Foo {
 >            : ^^^^
 >super : typeof Foo
 >      : ^^^^^^^^^^
->1337 : number
->     : ^^^^^^
+>1337 : 1337
+>     : ^^^^
         }
         else {
             const value = this.bar();  // Error
@@ -434,7 +434,7 @@ export class BarIncorrectlyWorks extends Foo {
     bar(): number { return 4; }
 >bar : () => number
 >    : ^^^^^^      
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 }
 
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types
index a306b2f739c..c12a87568c3 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types
@@ -27,16 +27,16 @@ class Derived extends Based {
 >     : ^^^^
 
         this.x = 10;
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         var that = this;
 >that : this
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.types
index fbf2347e673..ad9fbf07273 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.types
@@ -17,16 +17,16 @@ class Derived extends Based {
 
     constructor() {
         this.x = 100;
->this.x = 100 : number
->             : ^^^^^^
+>this.x = 100 : 100
+>             : ^^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
         super();
 >super() : void
@@ -35,16 +35,16 @@ class Derived extends Based {
 >      : ^^^^^^^^^^^^
 
         this.x = 10;
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         var that = this;
 >that : this
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types
index b7c2d0126cc..7bcc3232a8a 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types
@@ -45,16 +45,16 @@ class Derived extends Based {
 >      : ^^^^^^^^^^^^
 
         this.x = 10;
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         var that = this;
 >that : this
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types
index 18841234cc9..e5fd1ae3b6e 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types
@@ -62,16 +62,16 @@ class Derived extends Based {
 >      : ^^^^^^^^^^^^
 
         this.x = 10;
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         var that = this;
 >that : this
diff --git a/tests/baselines/reference/circularContextualMappedType.types b/tests/baselines/reference/circularContextualMappedType.types
index e84b8b53a57..6fff8e2366a 100644
--- a/tests/baselines/reference/circularContextualMappedType.types
+++ b/tests/baselines/reference/circularContextualMappedType.types
@@ -34,8 +34,8 @@ reproduce({
 >     : ^^^^^^^^^^^^
 >() => { return 123 } : () => number
 >                     : ^^^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 });
 
@@ -50,8 +50,8 @@ reproduce({
   name() { return 123 }
 >name : () => number
 >     : ^^^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 });
 
@@ -68,8 +68,8 @@ reproduce({
 >     : ^^^^^^^^^^^^
 >function () { return 123 } : () => number
 >                           : ^^^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 });
 
diff --git a/tests/baselines/reference/circularContextualReturnType.types b/tests/baselines/reference/circularContextualReturnType.types
index fdf53c4c8bc..e7e83538cd5 100644
--- a/tests/baselines/reference/circularContextualReturnType.types
+++ b/tests/baselines/reference/circularContextualReturnType.types
@@ -28,8 +28,8 @@ Object.freeze({
 >       : ^^^^^^^^^^^^^^^^^
 >freeze : { <T extends Function>(f: T): T; <T extends { [idx: string]: U | null | undefined | object; }, U extends string | bigint | number | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >       : ^^^ ^^^^^^^^^        ^^ ^^ ^^^ ^^^ ^^^^^^^^^                                                 ^^ ^^^^^^^^^                                           ^^ ^^ ^^^           ^^^ ^^ ^^ ^^^           ^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
     },
 });
diff --git a/tests/baselines/reference/circularInstantiationExpression.types b/tests/baselines/reference/circularInstantiationExpression.types
index 9c1b0a212bc..e5e41230272 100644
--- a/tests/baselines/reference/circularInstantiationExpression.types
+++ b/tests/baselines/reference/circularInstantiationExpression.types
@@ -14,6 +14,6 @@ foo("");
 >        : ^ ^^^^^^^^^^^^^^^^
 >foo : <T>(t: T) => typeof foo<T>
 >    : ^ ^^ ^^ ^^^^^             
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/circularMappedTypeConstraint.types b/tests/baselines/reference/circularMappedTypeConstraint.types
index a602003582c..ef477756194 100644
--- a/tests/baselines/reference/circularMappedTypeConstraint.types
+++ b/tests/baselines/reference/circularMappedTypeConstraint.types
@@ -20,6 +20,6 @@ export const r2 = foo2({A: "a"});
 >         : ^^^^^^^^^^^^^^
 >A : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/circularOptionalityRemoval.types b/tests/baselines/reference/circularOptionalityRemoval.types
index fa047672bce..97900e2f78d 100644
--- a/tests/baselines/reference/circularOptionalityRemoval.types
+++ b/tests/baselines/reference/circularOptionalityRemoval.types
@@ -17,8 +17,8 @@ function fn1(x: number | undefined = x > 0 ? x : 0) { }
 >  : ^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // Report from user
 function fn2(x?: string = someCondition ? 'value1' : x) { }
@@ -30,8 +30,8 @@ function fn2(x?: string = someCondition ? 'value1' : x) { }
 >                             : ^^^^^^^^^^^^^^^^^^
 >someCondition : any
 >              : ^^^
->'value1' : string
->         : ^^^^^^
+>'value1' : "value1"
+>         : ^^^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/circularReference.types b/tests/baselines/reference/circularReference.types
index 29929656561..4b662336201 100644
--- a/tests/baselines/reference/circularReference.types
+++ b/tests/baselines/reference/circularReference.types
@@ -65,8 +65,8 @@ export module M1 {
 >   : ^^
 
 			this.m1.x = 20; // OK
->this.m1.x = 20 : number
->               : ^^^^^^
+>this.m1.x = 20 : 20
+>               : ^^
 >this.m1.x : number
 >          : ^^^^^^
 >this.m1 : foo1.M1.C1
@@ -77,8 +77,8 @@ export module M1 {
 >   : ^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 			var tmp = new M1.C1();
 >tmp : C1
@@ -93,16 +93,16 @@ export module M1 {
 >   : ^^^^^^^^^
 
 			tmp.y = 10; // OK
->tmp.y = 10 : number
->           : ^^^^^^
+>tmp.y = 10 : 10
+>           : ^^
 >tmp.y : number
 >      : ^^^^^^
 >tmp : C1
 >    : ^^
 >y : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 			tmp.x = 20; // Error			
 >tmp.x = 20 : 20
@@ -168,8 +168,8 @@ export module M1 {
 >   : ^^^^^^^^^^^^^^^^^
 
 			this.m1.y = 10; // OK
->this.m1.y = 10 : number
->               : ^^^^^^
+>this.m1.y = 10 : 10
+>               : ^^
 >this.m1.y : number
 >          : ^^^^^^
 >this.m1 : foo2.M1.C1
@@ -180,8 +180,8 @@ export module M1 {
 >   : ^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 			this.m1.x = 20; // Error
 >this.m1.x = 20 : 20
diff --git a/tests/baselines/reference/circularReferenceInReturnType2.types b/tests/baselines/reference/circularReferenceInReturnType2.types
index 33164ac2816..11979f17773 100644
--- a/tests/baselines/reference/circularReferenceInReturnType2.types
+++ b/tests/baselines/reference/circularReferenceInReturnType2.types
@@ -118,8 +118,8 @@ const A = object<Something>()({
   name: "A",
 >name : string
 >     : ^^^^^^
->"A" : string
->    : ^^^^^^
+>"A" : "A"
+>    : ^^^
 
   fields: () => ({
 >fields : () => any
diff --git a/tests/baselines/reference/circularResolvedSignature.types b/tests/baselines/reference/circularResolvedSignature.types
index 8f9a04368a4..567ee115b9b 100644
--- a/tests/baselines/reference/circularResolvedSignature.types
+++ b/tests/baselines/reference/circularResolvedSignature.types
@@ -54,8 +54,8 @@ export function Component() {
         value: "string", // this should be a number
 >value : string
 >      : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
         foo: (arg) => setState(arg),
 >foo : (arg: any) => void
diff --git a/tests/baselines/reference/classCanExtendConstructorFunction.types b/tests/baselines/reference/classCanExtendConstructorFunction.types
index bdd991a689f..a95d604aedf 100644
--- a/tests/baselines/reference/classCanExtendConstructorFunction.types
+++ b/tests/baselines/reference/classCanExtendConstructorFunction.types
@@ -190,8 +190,8 @@ class Sql extends Wagon {
 >                                                   : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please do not use XML. It was a joke." : string
->                                        : ^^^^^^
+>"please do not use XML. It was a joke." : "please do not use XML. It was a joke."
+>                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
         else {
             super.speed() // run faster
@@ -312,7 +312,7 @@ class Conestoga extends Wagon {
 >              : ^^^^
 >super : typeof Wagon
 >      : ^^^^^^^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
     }
     // should error since others is not optional
@@ -410,8 +410,8 @@ var soup = new Soup(1);
 >            : ^^^^^^^^^^^^
 >Soup : typeof Soup
 >     : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 soup.flavour
 >soup.flavour : number
diff --git a/tests/baselines/reference/classConstructorAccessibility.types b/tests/baselines/reference/classConstructorAccessibility.types
index 93216762f5a..d948d53f770 100644
--- a/tests/baselines/reference/classConstructorAccessibility.types
+++ b/tests/baselines/reference/classConstructorAccessibility.types
@@ -35,8 +35,8 @@ var c = new C(1);
 >         : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var d = new D(1); // error
 >d : any
@@ -96,8 +96,8 @@ module Generic {
 >         : ^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     var d = new D(1); // error
 >d : any
diff --git a/tests/baselines/reference/classConstructorAccessibility2.types b/tests/baselines/reference/classConstructorAccessibility2.types
index e7d95ddc023..1cea0e9890d 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.types
+++ b/tests/baselines/reference/classConstructorAccessibility2.types
@@ -16,8 +16,8 @@ class BaseA {
 >             : ^^^^^
 >BaseA : typeof BaseA
 >      : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 class BaseB {
@@ -35,8 +35,8 @@ class BaseB {
 >             : ^^^^^
 >BaseB : typeof BaseB
 >      : ^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 
 class BaseC {
@@ -54,8 +54,8 @@ class BaseC {
 >             : ^^^^^
 >BaseC : typeof BaseC
 >      : ^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     static staticInstance() { new BaseC(4); }
 >staticInstance : () => void
@@ -64,8 +64,8 @@ class BaseC {
 >             : ^^^^^
 >BaseC : typeof BaseC
 >      : ^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 }
 
 class DerivedA extends BaseA {
@@ -91,8 +91,8 @@ class DerivedA extends BaseA {
 >                : ^^^^^^^^
 >DerivedA : typeof DerivedA
 >         : ^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
     createBaseInstance() { new BaseA(6); }
 >createBaseInstance : () => void
@@ -101,8 +101,8 @@ class DerivedA extends BaseA {
 >             : ^^^^^
 >BaseA : typeof BaseA
 >      : ^^^^^^^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
     static staticBaseInstance() { new BaseA(7); }
 >staticBaseInstance : () => void
@@ -111,8 +111,8 @@ class DerivedA extends BaseA {
 >             : ^^^^^
 >BaseA : typeof BaseA
 >      : ^^^^^^^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 }
 
 class DerivedB extends BaseB {
@@ -138,8 +138,8 @@ class DerivedB extends BaseB {
 >                : ^^^^^^^^
 >DerivedB : typeof DerivedB
 >         : ^^^^^^^^^^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
     createBaseInstance() { new BaseB(8); } // ok
 >createBaseInstance : () => void
@@ -148,8 +148,8 @@ class DerivedB extends BaseB {
 >             : ^^^^^
 >BaseB : typeof BaseB
 >      : ^^^^^^^^^^^^
->8 : number
->  : ^^^^^^
+>8 : 8
+>  : ^
 
     static staticBaseInstance() { new BaseB(9); } // ok
 >staticBaseInstance : () => void
@@ -158,8 +158,8 @@ class DerivedB extends BaseB {
 >             : ^^^^^
 >BaseB : typeof BaseB
 >      : ^^^^^^^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 }
 
 class DerivedC extends BaseC { // error
@@ -185,8 +185,8 @@ class DerivedC extends BaseC { // error
 >                : ^^^^^^^^
 >DerivedC : typeof DerivedC
 >         : ^^^^^^^^^^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     createBaseInstance() { new BaseC(10); } // error
 >createBaseInstance : () => void
@@ -216,8 +216,8 @@ var ba = new BaseA(1);
 >             : ^^^^^
 >BaseA : typeof BaseA
 >      : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var bb = new BaseB(1); // error
 >bb : any
@@ -246,8 +246,8 @@ var da = new DerivedA(1);
 >                : ^^^^^^^^
 >DerivedA : typeof DerivedA
 >         : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var db = new DerivedB(1);
 >db : DerivedB
@@ -256,8 +256,8 @@ var db = new DerivedB(1);
 >                : ^^^^^^^^
 >DerivedB : typeof DerivedB
 >         : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var dc = new DerivedC(1);
 >dc : DerivedC
@@ -266,6 +266,6 @@ var dc = new DerivedC(1);
 >                : ^^^^^^^^
 >DerivedC : typeof DerivedC
 >         : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/classExtendingClass.types b/tests/baselines/reference/classExtendingClass.types
index 03f4da9c4fb..9cc59406f15 100644
--- a/tests/baselines/reference/classExtendingClass.types
+++ b/tests/baselines/reference/classExtendingClass.types
@@ -144,8 +144,8 @@ var r7 = d2.thing('');
 >   : ^^^^^^^^^^
 >thing : (x: string) => void
 >      : ^ ^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r8 = D2.other(1);
 >r8 : void
@@ -158,6 +158,6 @@ var r8 = D2.other(1);
 >   : ^^^^^^^^^
 >other : <T>(x: T) => void
 >      : ^ ^^ ^^ ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/classExtendingClassLikeType.types b/tests/baselines/reference/classExtendingClassLikeType.types
index 110195331ae..709f22c054b 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.types
+++ b/tests/baselines/reference/classExtendingClassLikeType.types
@@ -61,34 +61,34 @@ class D1 extends getBase() {
 >                    : ^^^^
 >super : BaseConstructor
 >      : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
->"def" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
+>"def" : "def"
+>      : ^^^^^
 
         this.x = "x";
->this.x = "x" : string
->             : ^^^^^^
+>this.x = "x" : "x"
+>             : ^^^
 >this.x : string
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : string
 >  : ^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
         this.y = "y";
->this.y = "y" : string
->             : ^^^^^^
+>this.y = "y" : "y"
+>             : ^^^
 >this.y : string
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
     }
 }
 
@@ -106,42 +106,42 @@ class D2 extends getBase() <number> {
 >          : ^^^^
 >super : BaseConstructor
 >      : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         super(10, 20);
 >super(10, 20) : void
 >              : ^^^^
 >super : BaseConstructor
 >      : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
         this.x = 1;
->this.x = 1 : number
->           : ^^^^^^
+>this.x = 1 : 1
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.y = 2;
->this.y = 2 : number
->           : ^^^^^^
+>this.y = 2 : 2
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
@@ -159,34 +159,34 @@ class D3 extends getBase() <string, number> {
 >                 : ^^^^
 >super : BaseConstructor
 >      : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
->42 : number
->   : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
+>42 : 42
+>   : ^^
 
         this.x = "x";
->this.x = "x" : string
->             : ^^^^^^
+>this.x = "x" : "x"
+>             : ^^^
 >this.x : string
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : string
 >  : ^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
         this.y = 2;
->this.y = 2 : number
->           : ^^^^^^
+>this.y = 2 : 2
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/classFunctionMerging.types b/tests/baselines/reference/classFunctionMerging.types
index 7da7dbb1318..79b4d7f0dac 100644
--- a/tests/baselines/reference/classFunctionMerging.types
+++ b/tests/baselines/reference/classFunctionMerging.types
@@ -32,8 +32,8 @@ const a = new Foo("");
 >            : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 const b = Foo(12);
 >b : number
@@ -42,6 +42,6 @@ const b = Foo(12);
 >        : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
diff --git a/tests/baselines/reference/classFunctionMerging2.types b/tests/baselines/reference/classFunctionMerging2.types
index cc59f37df0d..0fd7138a279 100644
--- a/tests/baselines/reference/classFunctionMerging2.types
+++ b/tests/baselines/reference/classFunctionMerging2.types
@@ -42,8 +42,8 @@ let b = new B("Hey")
 >             : ^
 >B : typeof B
 >  : ^^^^^^^^
->"Hey" : string
->      : ^^^^^^
+>"Hey" : "Hey"
+>      : ^^^^^
 
 console.log(b.a)
 >console.log(b.a) : void
diff --git a/tests/baselines/reference/classImplementsClass2.types b/tests/baselines/reference/classImplementsClass2.types
index bdba29529f5..1652941bea0 100644
--- a/tests/baselines/reference/classImplementsClass2.types
+++ b/tests/baselines/reference/classImplementsClass2.types
@@ -6,8 +6,8 @@ class A { foo(): number { return 1; } }
 >  : ^
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C implements A {} // error
 >C : C
diff --git a/tests/baselines/reference/classImplementsClass3.types b/tests/baselines/reference/classImplementsClass3.types
index 494e5f81045..224d3ac1457 100644
--- a/tests/baselines/reference/classImplementsClass3.types
+++ b/tests/baselines/reference/classImplementsClass3.types
@@ -6,8 +6,8 @@ class A { foo(): number { return 1; } }
 >  : ^
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C implements A {
 >C : C
diff --git a/tests/baselines/reference/classImplementsClass4.types b/tests/baselines/reference/classImplementsClass4.types
index 0562263ee9d..7e12aac17ac 100644
--- a/tests/baselines/reference/classImplementsClass4.types
+++ b/tests/baselines/reference/classImplementsClass4.types
@@ -14,8 +14,8 @@ class A {
     foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 class C implements A {
 >C : C
diff --git a/tests/baselines/reference/classImplementsClass5.types b/tests/baselines/reference/classImplementsClass5.types
index b85d3b44ed0..43990431980 100644
--- a/tests/baselines/reference/classImplementsClass5.types
+++ b/tests/baselines/reference/classImplementsClass5.types
@@ -14,8 +14,8 @@ class A {
     foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 class C implements A {
 >C : C
diff --git a/tests/baselines/reference/classImplementsClass6.types b/tests/baselines/reference/classImplementsClass6.types
index cfecd3c51cc..3d01e91a477 100644
--- a/tests/baselines/reference/classImplementsClass6.types
+++ b/tests/baselines/reference/classImplementsClass6.types
@@ -10,14 +10,14 @@ class A {
 >    : ^^^^^^      
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 class C implements A {
 >C : C
diff --git a/tests/baselines/reference/classMemberInitializerScoping.types b/tests/baselines/reference/classMemberInitializerScoping.types
index bdbbaf5015d..66aa9556ab3 100644
--- a/tests/baselines/reference/classMemberInitializerScoping.types
+++ b/tests/baselines/reference/classMemberInitializerScoping.types
@@ -28,16 +28,16 @@ class CCC {
 >    : ^^^
 
         this.y = ''; // was: error, cannot assign string to number
->this.y = '' : string
->            : ^^^^^^
+>this.y = '' : ""
+>            : ^^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/classPropertyErrorOnNameOnly.errors.txt b/tests/baselines/reference/classPropertyErrorOnNameOnly.errors.txt
index 0836bc619f9..dd476a60fe7 100644
--- a/tests/baselines/reference/classPropertyErrorOnNameOnly.errors.txt
+++ b/tests/baselines/reference/classPropertyErrorOnNameOnly.errors.txt
@@ -1,9 +1,8 @@
-classPropertyErrorOnNameOnly.ts(7,3): error TS2322: Type '(val: Values) => string | undefined' is not assignable to type 'FuncType'.
+classPropertyErrorOnNameOnly.ts(7,3): error TS2322: Type '(val: Values) => "1" | "2" | "3" | "4" | "5" | undefined' is not assignable to type 'FuncType'.
   Type 'string | undefined' is not assignable to type 'string'.
     Type 'undefined' is not assignable to type 'string'.
-classPropertyErrorOnNameOnly.ts(24,7): error TS2322: Type '(val: Values) => string | undefined' is not assignable to type 'FuncType'.
+classPropertyErrorOnNameOnly.ts(24,7): error TS2322: Type '(val: Values) => "1" | "2" | "3" | "4" | "5" | undefined' is not assignable to type 'FuncType'.
   Type 'string | undefined' is not assignable to type 'string'.
-    Type 'undefined' is not assignable to type 'string'.
 
 
 ==== classPropertyErrorOnNameOnly.ts (2 errors) ====
@@ -15,7 +14,7 @@ classPropertyErrorOnNameOnly.ts(24,7): error TS2322: Type '(val: Values) => stri
     class Example {
       insideClass: FuncType = function(val) { // error span goes from here
       ~~~~~~~~~~~
-!!! error TS2322: Type '(val: Values) => string | undefined' is not assignable to type 'FuncType'.
+!!! error TS2322: Type '(val: Values) => "1" | "2" | "3" | "4" | "5" | undefined' is not assignable to type 'FuncType'.
 !!! error TS2322:   Type 'string | undefined' is not assignable to type 'string'.
 !!! error TS2322:     Type 'undefined' is not assignable to type 'string'.
         switch (val) {
@@ -36,9 +35,8 @@ classPropertyErrorOnNameOnly.ts(24,7): error TS2322: Type '(val: Values) => stri
     
     const outsideClass: FuncType = function(val) { // compare to errors only on this line in this case 
           ~~~~~~~~~~~~
-!!! error TS2322: Type '(val: Values) => string | undefined' is not assignable to type 'FuncType'.
+!!! error TS2322: Type '(val: Values) => "1" | "2" | "3" | "4" | "5" | undefined' is not assignable to type 'FuncType'.
 !!! error TS2322:   Type 'string | undefined' is not assignable to type 'string'.
-!!! error TS2322:     Type 'undefined' is not assignable to type 'string'.
         switch (val) {
           case 1:
             return "1";
diff --git a/tests/baselines/reference/classPropertyErrorOnNameOnly.types b/tests/baselines/reference/classPropertyErrorOnNameOnly.types
index 2db74e9f55c..1b980fc5158 100644
--- a/tests/baselines/reference/classPropertyErrorOnNameOnly.types
+++ b/tests/baselines/reference/classPropertyErrorOnNameOnly.types
@@ -19,8 +19,8 @@ class Example {
   insideClass: FuncType = function(val) { // error span goes from here
 >insideClass : FuncType
 >            : ^^^^^^^^
->function(val) { // error span goes from here    switch (val) {      case 1:        return "1";      case 2:        return "2";      case 3:        return "3"      case 4:        return "4"      case 5:        return "5"      // forgot case 6    }  } : (val: Values) => string | undefined
->                                                                                                                                                                                                                                                          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>function(val) { // error span goes from here    switch (val) {      case 1:        return "1";      case 2:        return "2";      case 3:        return "3"      case 4:        return "4"      case 5:        return "5"      // forgot case 6    }  } : (val: Values) => "1" | "2" | "3" | "4" | "5" | undefined
+>                                                                                                                                                                                                                                                          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >val : Values
 >    : ^^^^^^
 
@@ -33,40 +33,40 @@ class Example {
 >  : ^
 
         return "1";
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
       case 2:
 >2 : 2
 >  : ^
 
         return "2";
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
       case 3:
 >3 : 3
 >  : ^
 
         return "3"
->"3" : string
->    : ^^^^^^
+>"3" : "3"
+>    : ^^^
 
       case 4:
 >4 : 4
 >  : ^
 
         return "4"
->"4" : string
->    : ^^^^^^
+>"4" : "4"
+>    : ^^^
 
       case 5:
 >5 : 5
 >  : ^
 
         return "5"
->"5" : string
->    : ^^^^^^
+>"5" : "5"
+>    : ^^^
 
       // forgot case 6
     }
@@ -76,8 +76,8 @@ class Example {
 const outsideClass: FuncType = function(val) { // compare to errors only on this line in this case 
 >outsideClass : FuncType
 >             : ^^^^^^^^
->function(val) { // compare to errors only on this line in this case     switch (val) {      case 1:        return "1";      case 2:        return "2";      case 3:        return "3"      case 4:        return "4"      case 5:        return "5"      // forgot case 6    }} : (val: Values) => string | undefined
->                                                                                                                                                                                                                                                                                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>function(val) { // compare to errors only on this line in this case     switch (val) {      case 1:        return "1";      case 2:        return "2";      case 3:        return "3"      case 4:        return "4"      case 5:        return "5"      // forgot case 6    }} : (val: Values) => "1" | "2" | "3" | "4" | "5" | undefined
+>                                                                                                                                                                                                                                                                                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >val : Values
 >    : ^^^^^^
 
@@ -90,40 +90,40 @@ const outsideClass: FuncType = function(val) { // compare to errors only on this
 >  : ^
 
         return "1";
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
       case 2:
 >2 : 2
 >  : ^
 
         return "2";
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
       case 3:
 >3 : 3
 >  : ^
 
         return "3"
->"3" : string
->    : ^^^^^^
+>"3" : "3"
+>    : ^^^
 
       case 4:
 >4 : 4
 >  : ^
 
         return "4"
->"4" : string
->    : ^^^^^^
+>"4" : "4"
+>    : ^^^
 
       case 5:
 >5 : 5
 >  : ^
 
         return "5"
->"5" : string
->    : ^^^^^^
+>"5" : "5"
+>    : ^^^
 
       // forgot case 6
     }
diff --git a/tests/baselines/reference/classReferencedInContextualParameterWithinItsOwnBaseExpression.types b/tests/baselines/reference/classReferencedInContextualParameterWithinItsOwnBaseExpression.types
index 66cf148dd1f..0b3d3b72e0c 100644
--- a/tests/baselines/reference/classReferencedInContextualParameterWithinItsOwnBaseExpression.types
+++ b/tests/baselines/reference/classReferencedInContextualParameterWithinItsOwnBaseExpression.types
@@ -68,8 +68,8 @@ export class A extends Class<A>("A")(
 >              : ^      ^^      ^^^^^^^^^^           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Class : <Self>(identifier: string) => <Fields>(fields: Fields, annotations?: Schema<Self>) => Class<OutputFrom<Fields>>
 >      : ^    ^^          ^^      ^^^^^                                                                                 
->"A" : string
->    : ^^^^^^
+>"A" : "A"
+>    : ^^^
 
   { a: string },
 >{ a: string } : { a: () => Type<string>; }
diff --git a/tests/baselines/reference/classSideInheritance1.types b/tests/baselines/reference/classSideInheritance1.types
index c2db5d26ccf..4366adf8ec9 100644
--- a/tests/baselines/reference/classSideInheritance1.types
+++ b/tests/baselines/reference/classSideInheritance1.types
@@ -10,14 +10,14 @@ class A {
 >    : ^^^^^^      
 
      return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
  
 class C2 extends A {}
diff --git a/tests/baselines/reference/classStaticBlock17.types b/tests/baselines/reference/classStaticBlock17.types
index 6fdea127bba..7154c7d0b98 100644
--- a/tests/baselines/reference/classStaticBlock17.types
+++ b/tests/baselines/reference/classStaticBlock17.types
@@ -137,8 +137,8 @@ const a = new A(41);
 >          : ^
 >A : typeof A
 >  : ^^^^^^^^
->41 : number
->   : ^^^^^^
+>41 : 41
+>   : ^^
 
 const b = new B(a);
 >b : B
diff --git a/tests/baselines/reference/classStaticBlock24(module=amd).types b/tests/baselines/reference/classStaticBlock24(module=amd).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=amd).types
+++ b/tests/baselines/reference/classStaticBlock24(module=amd).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=commonjs).types b/tests/baselines/reference/classStaticBlock24(module=commonjs).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=commonjs).types
+++ b/tests/baselines/reference/classStaticBlock24(module=commonjs).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=es2015).types b/tests/baselines/reference/classStaticBlock24(module=es2015).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=es2015).types
+++ b/tests/baselines/reference/classStaticBlock24(module=es2015).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=es2020).types b/tests/baselines/reference/classStaticBlock24(module=es2020).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=es2020).types
+++ b/tests/baselines/reference/classStaticBlock24(module=es2020).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=es2022).types b/tests/baselines/reference/classStaticBlock24(module=es2022).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=es2022).types
+++ b/tests/baselines/reference/classStaticBlock24(module=es2022).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=esnext).types b/tests/baselines/reference/classStaticBlock24(module=esnext).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=esnext).types
+++ b/tests/baselines/reference/classStaticBlock24(module=esnext).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=system).types b/tests/baselines/reference/classStaticBlock24(module=system).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=system).types
+++ b/tests/baselines/reference/classStaticBlock24(module=system).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock24(module=umd).types b/tests/baselines/reference/classStaticBlock24(module=umd).types
index 8468f155302..278c9a0a3fe 100644
--- a/tests/baselines/reference/classStaticBlock24(module=umd).types
+++ b/tests/baselines/reference/classStaticBlock24(module=umd).types
@@ -11,16 +11,16 @@ export class C {
 
   static {
     C.x = 1;
->C.x = 1 : number
->        : ^^^^^^
+>C.x = 1 : 1
+>        : ^
 >C.x : number
 >    : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/classStaticBlock28.types b/tests/baselines/reference/classStaticBlock28.types
index 1ba1283e002..028f9e4a67b 100644
--- a/tests/baselines/reference/classStaticBlock28.types
+++ b/tests/baselines/reference/classStaticBlock28.types
@@ -11,12 +11,12 @@ class C {
 
     static {
         foo = 1
->foo = 1 : number
->        : ^^^^^^
+>foo = 1 : 1
+>        : ^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/classStaticPropertyAccess.types b/tests/baselines/reference/classStaticPropertyAccess.types
index 2dc6dabf4e5..028892e1600 100644
--- a/tests/baselines/reference/classStaticPropertyAccess.types
+++ b/tests/baselines/reference/classStaticPropertyAccess.types
@@ -12,20 +12,20 @@ class A {
     public static x: number = 1;
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     public static y: number = 1;
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     private static _b: number = 2;
 >_b : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 
 const a = new A();
diff --git a/tests/baselines/reference/classStaticPropertyTypeGuard.types b/tests/baselines/reference/classStaticPropertyTypeGuard.types
index 129d4d360a6..4935ca62644 100644
--- a/tests/baselines/reference/classStaticPropertyTypeGuard.types
+++ b/tests/baselines/reference/classStaticPropertyTypeGuard.types
@@ -32,15 +32,15 @@ class A {
 >   : ^^^^^^
         }
         return A._a = 'helloworld';
->A._a = 'helloworld' : string
->                    : ^^^^^^
+>A._a = 'helloworld' : "helloworld"
+>                    : ^^^^^^^^^^^^
 >A._a : string | undefined
 >     : ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
 >_a : string | undefined
 >   : ^^^^^^^^^^^^^^^^^^
->'helloworld' : string
->             : ^^^^^^
+>'helloworld' : "helloworld"
+>             : ^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/classUpdateTests.types b/tests/baselines/reference/classUpdateTests.types
index 8b7c3988c14..08f1de15229 100644
--- a/tests/baselines/reference/classUpdateTests.types
+++ b/tests/baselines/reference/classUpdateTests.types
@@ -250,16 +250,16 @@ class N {
 
 	constructor() {
 		this.p2 = 0;
->this.p2 = 0 : number
->            : ^^^^^^
+>this.p2 = 0 : 0
+>            : ^
 >this.p2 : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >p2 : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 	}
 }
 
diff --git a/tests/baselines/reference/classUsedBeforeInitializedVariables.types b/tests/baselines/reference/classUsedBeforeInitializedVariables.types
index 7bd37bc0606..76ce7c9ddfc 100644
--- a/tests/baselines/reference/classUsedBeforeInitializedVariables.types
+++ b/tests/baselines/reference/classUsedBeforeInitializedVariables.types
@@ -54,18 +54,18 @@ class Test {
         hello: (this.p6 = "string"),
 >hello : string
 >      : ^^^^^^
->(this.p6 = "string") : string
->                     : ^^^^^^
->this.p6 = "string" : string
->                   : ^^^^^^
+>(this.p6 = "string") : "string"
+>                     : ^^^^^^^^
+>this.p6 = "string" : "string"
+>                   : ^^^^^^^^
 >this.p6 : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >p6 : string
 >   : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
     };
 
diff --git a/tests/baselines/reference/classWithBaseClassButNoConstructor.types b/tests/baselines/reference/classWithBaseClassButNoConstructor.types
index 2e544215f05..9eaeaaeae33 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.types
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.types
@@ -42,8 +42,8 @@ var c2 = new C(1); // ok
 >         : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class Base2<T,U> {
 >Base2 : Base2<T, U>
@@ -86,8 +86,8 @@ var d2 = new D(1); // ok
 >         : ^^^^^^^^^^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // specialized base class
 class D2<T, U> extends Base2<string, number> {
@@ -122,8 +122,8 @@ var d4 = new D(1); // ok
 >         : ^^^^^^^^^^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class D3 extends Base2<string, number> {
 >D3 : D3
@@ -157,6 +157,6 @@ var d6 = new D(1); // ok
 >         : ^^^^^^^^^^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/classWithConstructors.types b/tests/baselines/reference/classWithConstructors.types
index 7097ccff793..5e40bd54ee5 100644
--- a/tests/baselines/reference/classWithConstructors.types
+++ b/tests/baselines/reference/classWithConstructors.types
@@ -29,8 +29,8 @@ module NonGeneric {
 >          : ^
 >C : typeof C
 >  : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     class C2 {
 >C2 : C2
@@ -64,8 +64,8 @@ module NonGeneric {
 >           : ^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var c5 = new C2(1); // ok
 >c5 : C2
@@ -74,8 +74,8 @@ module NonGeneric {
 >          : ^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     class D extends C2 { }
 >D : D
@@ -98,8 +98,8 @@ module NonGeneric {
 >         : ^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     var d3 = new D(''); // ok
 >d3 : D
@@ -108,8 +108,8 @@ module NonGeneric {
 >          : ^
 >D : typeof D
 >  : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 module Generics {
@@ -140,8 +140,8 @@ module Generics {
 >          : ^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     class C2<T,U> {
 >C2 : C2<T, U>
@@ -177,8 +177,8 @@ module Generics {
 >           : ^^^^^^^^^^^^^^^^^^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var c5 = new C2(1, 2); // ok
 >c5 : C2<number, number>
@@ -187,10 +187,10 @@ module Generics {
 >             : ^^^^^^^^^^^^^^^^^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
     class D<T, U> extends C2<T, U> { }
 >D : D<T, U>
@@ -213,8 +213,8 @@ module Generics {
 >         : ^^^^^^^^^^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     var d3 = new D(''); // ok
 >d3 : D<string, unknown>
@@ -223,6 +223,6 @@ module Generics {
 >          : ^^^^^^^^^^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
diff --git a/tests/baselines/reference/classWithDuplicateIdentifier.types b/tests/baselines/reference/classWithDuplicateIdentifier.types
index 8210b636dd1..3c272b68d9b 100644
--- a/tests/baselines/reference/classWithDuplicateIdentifier.types
+++ b/tests/baselines/reference/classWithDuplicateIdentifier.types
@@ -8,8 +8,8 @@ class C {
     a(): number { return 0; } // error: duplicate identifier
 >a : () => number
 >  : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     a: number;
 >a : () => number
@@ -26,8 +26,8 @@ class K {
     b(): number { return 0; }
 >b : () => number
 >  : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 class D {
 >D : D
diff --git a/tests/baselines/reference/classWithPrivateProperty.types b/tests/baselines/reference/classWithPrivateProperty.types
index 563819d2688..13d42c35d0c 100644
--- a/tests/baselines/reference/classWithPrivateProperty.types
+++ b/tests/baselines/reference/classWithPrivateProperty.types
@@ -20,8 +20,8 @@ class C {
     private b: string = '';
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     private c() { return '' }
 >c : () => string
diff --git a/tests/baselines/reference/classWithProtectedProperty.types b/tests/baselines/reference/classWithProtectedProperty.types
index fb60667389f..226ea9dff9e 100644
--- a/tests/baselines/reference/classWithProtectedProperty.types
+++ b/tests/baselines/reference/classWithProtectedProperty.types
@@ -19,8 +19,8 @@ class C {
     protected b: string = '';
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     protected c() { return '' }
 >c : () => string
diff --git a/tests/baselines/reference/classWithPublicProperty.types b/tests/baselines/reference/classWithPublicProperty.types
index 2af452d2f2c..c390a26644a 100644
--- a/tests/baselines/reference/classWithPublicProperty.types
+++ b/tests/baselines/reference/classWithPublicProperty.types
@@ -17,8 +17,8 @@ class C {
     public b: string = '';
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     public c() { return '' }
 >c : () => string
diff --git a/tests/baselines/reference/classdecl.types b/tests/baselines/reference/classdecl.types
index 5c2af934ec7..51fb325e330 100644
--- a/tests/baselines/reference/classdecl.types
+++ b/tests/baselines/reference/classdecl.types
@@ -31,8 +31,8 @@ class a {
 >  : ^^^^^^
 
         return 30;
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
     }
     public set d(a: number) {
 >d : number
diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types
index 8c15eef133c..30d56ceaeb4 100644
--- a/tests/baselines/reference/cloduleTest1.types
+++ b/tests/baselines/reference/cloduleTest1.types
@@ -37,10 +37,10 @@
 >          : ^
 >$ : typeof $
 >  : ^^^^^^^^
->'.foo' : string
+>'.foo' : ".foo"
 >       : ^^^^^^
 >addClass : (className: string) => $
 >         : ^         ^^      ^^^^^ 
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/coAndContraVariantInferences.types b/tests/baselines/reference/coAndContraVariantInferences.types
index b58966e85c5..895e19624b1 100644
--- a/tests/baselines/reference/coAndContraVariantInferences.types
+++ b/tests/baselines/reference/coAndContraVariantInferences.types
@@ -82,8 +82,8 @@ const actionA = { payload: 'any-string' } as Action<'ACTION_A', string>;
 >                          : ^^^^^^^^^^^^^^^^^^^^
 >payload : string
 >        : ^^^^^^
->'any-string' : string
->             : ^^^^^^
+>'any-string' : "any-string"
+>             : ^^^^^^^^^^^^
 
 const actionB = { payload: true } as Action<'ACTION_B', boolean>;
 >actionB : Action<"ACTION_B", boolean>
diff --git a/tests/baselines/reference/coAndContraVariantInferences3.types b/tests/baselines/reference/coAndContraVariantInferences3.types
index 23072d6c5f4..30b29ccb9eb 100644
--- a/tests/baselines/reference/coAndContraVariantInferences3.types
+++ b/tests/baselines/reference/coAndContraVariantInferences3.types
@@ -310,8 +310,8 @@ buildOverload("updateImportDeclaration")
 >                                         : ^^^^^^^^^^^^^^^
 >buildOverload : (name: string) => OverloadBuilder
 >              : ^    ^^      ^^^^^               
->"updateImportDeclaration" : string
->                          : ^^^^^^
+>"updateImportDeclaration" : "updateImportDeclaration"
+>                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
     .overload({
 >overload : <T extends OverloadDefinitions>(overloads: T) => BindableOverloadBuilder<T>
diff --git a/tests/baselines/reference/coAndContraVariantInferences7.types b/tests/baselines/reference/coAndContraVariantInferences7.types
index 4c9ac988732..789394b5b41 100644
--- a/tests/baselines/reference/coAndContraVariantInferences7.types
+++ b/tests/baselines/reference/coAndContraVariantInferences7.types
@@ -78,8 +78,8 @@ route({
     query: "",
 >query : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
   handle: (req) => {
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.types b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.types
index f1837b674a6..5cdd4085186 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.types
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.types
@@ -18,8 +18,8 @@ class Foo {
 >       : ^^^^^^^^^^
         }
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set prop1(val: number) {
 >prop1 : number
@@ -48,8 +48,8 @@ class b extends Foo {
 >       : ^^^^^^^^^^
         }
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set prop2(val: number) {
 >prop2 : number
@@ -85,8 +85,8 @@ class c extends Foo {
             }
         }
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set prop2(val: number) {
 >prop2 : number
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.types b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.types
index 9809f1f79fd..61a3fc17098 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.types
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.types
@@ -22,8 +22,8 @@ class Foo {
 >   : ^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set prop1(val: number) {
 >prop1 : number
@@ -55,8 +55,8 @@ class b extends Foo {
 >   : ^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set prop2(val: number) {
 >prop2 : number
@@ -94,8 +94,8 @@ class c extends Foo {
 >   : ^^
         }
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set prop2(val: number) {
 >prop2 : number
diff --git a/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.types b/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.types
index a971f4ff45b..44742cad610 100644
--- a/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.types
+++ b/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.types
@@ -14,10 +14,10 @@ var f = () => this;
 >     : ^^^^^^^^^^^^^^^^^
 
 _this = 10; // Error
->_this = 10 : number
->           : ^^^^^^
+>_this = 10 : 10
+>           : ^^
 >_this : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.types b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.types
index 9924e077663..a0398800afc 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.types
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.types
@@ -39,8 +39,8 @@ class class1 {
         }
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set a(val: number) {
 >a : number
@@ -118,8 +118,8 @@ class class2 {
         }
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set a(val: number) {
 >a : number
diff --git a/tests/baselines/reference/commaOperatorLeftSideUnused.types b/tests/baselines/reference/commaOperatorLeftSideUnused.types
index ddc8018b3d7..cedcd7377fe 100644
--- a/tests/baselines/reference/commaOperatorLeftSideUnused.types
+++ b/tests/baselines/reference/commaOperatorLeftSideUnused.types
@@ -59,16 +59,16 @@ let x = Math.pow((3, 5), 2);
 >     : ^^^^
 >pow : (x: number, y: number) => number
 >    : ^ ^^      ^^ ^^      ^^^^^      
->(3, 5) : number
->       : ^^^^^^
->3, 5 : number
->     : ^^^^^^
+>(3, 5) : 5
+>       : ^
+>3, 5 : 5
+>     : ^
 >3 : 3
 >  : ^
->5 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>2 : 2
+>  : ^
 
 // Should error
 let a = [(3 + 4), ((1 + 1, 8) * 4)];
@@ -562,10 +562,10 @@ xx = (Math.pow(3, 2), 4);
 >     : ^^^^
 >pow : (x: number, y: number) => number
 >    : ^ ^^      ^^ ^^      ^^^^^      
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 >4 : 4
 >  : ^
 
diff --git a/tests/baselines/reference/commaOperatorOtherInvalidOperation.types b/tests/baselines/reference/commaOperatorOtherInvalidOperation.types
index ae712e7bf31..251c2944dc8 100644
--- a/tests/baselines/reference/commaOperatorOtherInvalidOperation.types
+++ b/tests/baselines/reference/commaOperatorOtherInvalidOperation.types
@@ -26,10 +26,10 @@ var resultIsString: number = foo(1, "123"); //error here
 >              : ^^^^^^
 >foo : (x: number, y: string) => string
 >    : ^ ^^      ^^ ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"123" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>"123" : "123"
+>      : ^^^^^
 
 //TypeParameters
 function foo1<T1, T2>() {
diff --git a/tests/baselines/reference/commaOperatorOtherValidOperation.types b/tests/baselines/reference/commaOperatorOtherValidOperation.types
index 1a56d6df784..8ae43b38f43 100644
--- a/tests/baselines/reference/commaOperatorOtherValidOperation.types
+++ b/tests/baselines/reference/commaOperatorOtherValidOperation.types
@@ -54,10 +54,10 @@ var resultIsString = foo(1, "123");
 >              : ^^^^^^
 >foo : (x: number, y: string) => string
 >    : ^ ^^      ^^ ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"123" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>"123" : "123"
+>      : ^^^^^
 
 //TypeParameters
 function foo1<T1, T2>()
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types b/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types
index bea8e1350b5..d6992f91190 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types
@@ -129,8 +129,8 @@ var x: any;
 >         : ^^^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >[null, 1] : number[]
 >          : ^^^^^^^^
 >1 : 1
@@ -199,8 +199,8 @@ var resultIsAny9 = ("string".charAt(0), undefined);
 >         : ^^^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types b/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types
index cdc74fd2eae..c2525034bbe 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types
@@ -159,20 +159,20 @@ BOOLEAN = false, 1;
 >  : ^
 
 "", NUMBER = 1;
->"", NUMBER = 1 : number
->               : ^^^^^^
+>"", NUMBER = 1 : 1
+>               : ^
 >"" : ""
 >   : ^^
->NUMBER = 1 : number
->           : ^^^^^^
+>NUMBER = 1 : 1
+>           : ^
 >NUMBER : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 STRING.trim(), NUMBER = 1;
->STRING.trim(), NUMBER = 1 : number
->                          : ^^^^^^
+>STRING.trim(), NUMBER = 1 : 1
+>                          : ^
 >STRING.trim() : string
 >              : ^^^^^^
 >STRING.trim : () => string
@@ -181,12 +181,12 @@ STRING.trim(), NUMBER = 1;
 >       : ^^^^^^
 >trim : () => string
 >     : ^^^^^^      
->NUMBER = 1 : number
->           : ^^^^^^
+>NUMBER = 1 : 1
+>           : ^
 >NUMBER : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var resultIsNumber6 = (null, NUMBER);
 >resultIsNumber6 : number
@@ -244,26 +244,26 @@ var resultIsNumber9 = (BOOLEAN = false, 1);
 var resultIsNumber10 = ("", NUMBER = 1);
 >resultIsNumber10 : number
 >                 : ^^^^^^
->("", NUMBER = 1) : number
->                 : ^^^^^^
->"", NUMBER = 1 : number
->               : ^^^^^^
+>("", NUMBER = 1) : 1
+>                 : ^
+>"", NUMBER = 1 : 1
+>               : ^
 >"" : ""
 >   : ^^
->NUMBER = 1 : number
->           : ^^^^^^
+>NUMBER = 1 : 1
+>           : ^
 >NUMBER : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var resultIsNumber11 = (STRING.trim(), NUMBER = 1);
 >resultIsNumber11 : number
 >                 : ^^^^^^
->(STRING.trim(), NUMBER = 1) : number
->                            : ^^^^^^
->STRING.trim(), NUMBER = 1 : number
->                          : ^^^^^^
+>(STRING.trim(), NUMBER = 1) : 1
+>                            : ^
+>STRING.trim(), NUMBER = 1 : 1
+>                          : ^
 >STRING.trim() : string
 >              : ^^^^^^
 >STRING.trim : () => string
@@ -272,10 +272,10 @@ var resultIsNumber11 = (STRING.trim(), NUMBER = 1);
 >       : ^^^^^^
 >trim : () => string
 >     : ^^^^^^      
->NUMBER = 1 : number
->           : ^^^^^^
+>NUMBER = 1 : 1
+>           : ^
 >NUMBER : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/commaOperatorsMultipleOperators.types b/tests/baselines/reference/commaOperatorsMultipleOperators.types
index 22b855d0d11..9eb2564e744 100644
--- a/tests/baselines/reference/commaOperatorsMultipleOperators.types
+++ b/tests/baselines/reference/commaOperatorsMultipleOperators.types
@@ -178,8 +178,8 @@ null, true, 1;
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >new Object() : Object
 >             : ^^^^^^
 >Object : ObjectConstructor
@@ -220,8 +220,8 @@ var resultIsObject2 = (++NUMBER, STRING.charAt(0), new Object());
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >new Object() : Object
 >             : ^^^^^^
 >Object : ObjectConstructor
diff --git a/tests/baselines/reference/commentBeforeStaticMethod1.types b/tests/baselines/reference/commentBeforeStaticMethod1.types
index 67927c93bbb..38645793d3f 100644
--- a/tests/baselines/reference/commentBeforeStaticMethod1.types
+++ b/tests/baselines/reference/commentBeforeStaticMethod1.types
@@ -13,7 +13,7 @@ class C {
 >    : ^^^^^^      
 
     return "bar";
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
   }
 }
diff --git a/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement.types b/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement.types
index 7cd35ceefe0..54ff2d7d5dc 100644
--- a/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement.types
+++ b/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement.types
@@ -24,8 +24,8 @@ export class Foo {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
   }
 
   foo(): Promise<void> {
diff --git a/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement2.types b/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement2.types
index 79cb1dc2fbf..5bbdfde96b4 100644
--- a/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement2.types
+++ b/tests/baselines/reference/commentEmitOnParenthesizedAssertionInReturnStatement2.types
@@ -24,8 +24,8 @@ export class Foo {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
   
     foo() {
diff --git a/tests/baselines/reference/commentOnAmbientVariable2.types b/tests/baselines/reference/commentOnAmbientVariable2.types
index 72e80c67036..ce109a9aa8e 100644
--- a/tests/baselines/reference/commentOnAmbientVariable2.types
+++ b/tests/baselines/reference/commentOnAmbientVariable2.types
@@ -7,12 +7,12 @@ declare var x: number;
 >  : ^^^^^^
 
 x = 2;
->x = 2 : number
->      : ^^^^^^
+>x = 2 : 2
+>      : ^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 === commentOnAmbientVariable2_1.ts ===
 var y = 1;
diff --git a/tests/baselines/reference/commentOnClassAccessor1.types b/tests/baselines/reference/commentOnClassAccessor1.types
index 77227581126..76b536249e3 100644
--- a/tests/baselines/reference/commentOnClassAccessor1.types
+++ b/tests/baselines/reference/commentOnClassAccessor1.types
@@ -11,6 +11,6 @@ class C {
   get bar(): number { return 1;}
 >bar : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/commentOnClassAccessor2.types b/tests/baselines/reference/commentOnClassAccessor2.types
index bca71e662b6..80e23714b6d 100644
--- a/tests/baselines/reference/commentOnClassAccessor2.types
+++ b/tests/baselines/reference/commentOnClassAccessor2.types
@@ -11,8 +11,8 @@ class C {
   get bar(): number { return 1;}
 >bar : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   /**
    * Setter.
diff --git a/tests/baselines/reference/commentOnDecoratedClassDeclaration.types b/tests/baselines/reference/commentOnDecoratedClassDeclaration.types
index 3898546f270..35b6306d68a 100644
--- a/tests/baselines/reference/commentOnDecoratedClassDeclaration.types
+++ b/tests/baselines/reference/commentOnDecoratedClassDeclaration.types
@@ -14,8 +14,8 @@ declare function decorator(x: string): any;
 >decorator("hello") : any
 >decorator : (x: string) => any
 >          : ^ ^^      ^^^^^   
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 class Remote { }
 >Remote : Remote
@@ -29,8 +29,8 @@ class Remote { }
 >decorator("hi") : any
 >decorator : (x: string) => any
 >          : ^ ^^      ^^^^^   
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 class AnotherRomote {
 >AnotherRomote : AnotherRomote
diff --git a/tests/baselines/reference/commentsClassMembers.types b/tests/baselines/reference/commentsClassMembers.types
index b3b2a4fa6b7..f90d83d2d51 100644
--- a/tests/baselines/reference/commentsClassMembers.types
+++ b/tests/baselines/reference/commentsClassMembers.types
@@ -916,8 +916,8 @@ var i1_r = i1.p2(20);
 >   : ^^
 >p2 : (b: number) => number
 >   : ^ ^^      ^^^^^^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 var i1_prop = i1.p3;
 >i1_prop : number
@@ -972,8 +972,8 @@ var i1_ncr = i1.nc_p2(20);
 >   : ^^
 >nc_p2 : (b: number) => number
 >      : ^ ^^      ^^^^^^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 var i1_ncprop = i1.nc_p3;
 >i1_ncprop : number
@@ -1028,8 +1028,8 @@ var i1_s_r = c1.s2(20);
 >   : ^^^^^^^^^
 >s2 : (b: number) => number
 >   : ^ ^^      ^^^^^^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 var i1_s_prop = c1.s3;
 >i1_s_prop : number
@@ -1084,8 +1084,8 @@ var i1_s_ncr = c1.nc_s2(20);
 >   : ^^^^^^^^^
 >nc_s2 : (b: number) => number
 >      : ^ ^^      ^^^^^^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 var i1_s_ncprop = c1.nc_s3;
 >i1_s_ncprop : number
diff --git a/tests/baselines/reference/commentsCommentParsing.types b/tests/baselines/reference/commentsCommentParsing.types
index 6ad9dd9b710..38ec3cb4e8d 100644
--- a/tests/baselines/reference/commentsCommentParsing.types
+++ b/tests/baselines/reference/commentsCommentParsing.types
@@ -202,10 +202,10 @@ sum(10, 20);
 >            : ^^^^^^
 >sum : (a: number, b: number) => number
 >    : ^ ^^      ^^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 /** This is multiplication function*/
 /** @param */
diff --git a/tests/baselines/reference/commentsFunction.types b/tests/baselines/reference/commentsFunction.types
index 3a9e9ff22e5..055b7652359 100644
--- a/tests/baselines/reference/commentsFunction.types
+++ b/tests/baselines/reference/commentsFunction.types
@@ -37,10 +37,10 @@ fooWithParameters("a", 10);
 >                           : ^^^^
 >fooWithParameters : (a: string, b: number) => void
 >                  : ^ ^^      ^^ ^^      ^^^^^^^^^
->"a" : string
->    : ^^^^^^
->10 : number
->   : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>10 : 10
+>   : ^^
 
 /** fooFunc
  * comment
@@ -98,20 +98,20 @@ lambdaFoo(10, 20);
 >                  : ^^^^^^
 >lambdaFoo : (a: number, b: number) => number
 >          : ^ ^^      ^^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 lambddaNoVarComment(10, 20);
 >lambddaNoVarComment(10, 20) : number
 >                            : ^^^^^^
 >lambddaNoVarComment : (a: number, b: number) => number
 >                    : ^ ^^      ^^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 function blah(a: string /* multiline trailing comment 
 >blah : (a: string) => void
diff --git a/tests/baselines/reference/commentsInheritance.types b/tests/baselines/reference/commentsInheritance.types
index 0edc400fce8..2169f4eca50 100644
--- a/tests/baselines/reference/commentsInheritance.types
+++ b/tests/baselines/reference/commentsInheritance.types
@@ -239,8 +239,8 @@ class c3 extends c2 {
 >          : ^^^^
 >super : typeof c2
 >      : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** c3 p1*/
     public p1: number;
@@ -285,8 +285,8 @@ var c2_i = new c2(10);
 >           : ^^
 >c2 : typeof c2
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c3_i = new c3();
 >c3_i : c3
@@ -318,8 +318,8 @@ var c4_i = new c4(10);
 >           : ^^
 >c4 : typeof c4
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 interface i2 {
     /** i2_p1*/
diff --git a/tests/baselines/reference/commentsInterface.types b/tests/baselines/reference/commentsInterface.types
index 1b1171a5879..740c812054b 100644
--- a/tests/baselines/reference/commentsInterface.types
+++ b/tests/baselines/reference/commentsInterface.types
@@ -112,8 +112,8 @@ var i2_i_foo_r = i2_i.foo(30);
 >     : ^^
 >foo : (b: number) => string
 >    : ^ ^^      ^^^^^      
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
 var i2_i_i2_si = i2_i["hello"];
 >i2_i_i2_si : any
@@ -172,8 +172,8 @@ var i2_i_nc_foo_r = i2_i.nc_foo(30);
 >     : ^^
 >nc_foo : (b: number) => string
 >       : ^ ^^      ^^^^^      
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
 var i2_i_r = i2_i(10, 20);
 >i2_i_r : number
@@ -182,10 +182,10 @@ var i2_i_r = i2_i(10, 20);
 >             : ^^^^^^
 >i2_i : i2
 >     : ^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 var i2_i_fnfoo = i2_i.fnfoo;
 >i2_i_fnfoo : (b: number) => string
@@ -208,8 +208,8 @@ var i2_i_fnfoo_r = i2_i.fnfoo(10);
 >     : ^^
 >fnfoo : (b: number) => string
 >      : ^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var i2_i_nc_fnfoo = i2_i.nc_fnfoo;
 >i2_i_nc_fnfoo : (b: number) => string
@@ -232,8 +232,8 @@ var i2_i_nc_fnfoo_r = i2_i.nc_fnfoo(10);
 >     : ^^
 >nc_fnfoo : (b: number) => string
 >         : ^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 interface i3 {
     /** Comment i3 x*/
@@ -357,8 +357,8 @@ i3_i.f(10);
 >     : ^^
 >f : (a: number) => string
 >  : ^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 i3_i.l(10);
 >i3_i.l(10) : string
@@ -369,8 +369,8 @@ i3_i.l(10);
 >     : ^^
 >l : (b: number) => string
 >  : ^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 i3_i.nc_f(10);
 >i3_i.nc_f(10) : string
@@ -381,8 +381,8 @@ i3_i.nc_f(10);
 >     : ^^
 >nc_f : (a: number) => string
 >     : ^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 i3_i.nc_l(10);
 >i3_i.nc_l(10) : string
@@ -393,6 +393,6 @@ i3_i.nc_l(10);
 >     : ^^
 >nc_l : (b: number) => string
 >     : ^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types
index 556e3608921..4aacda5c1b1 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral4.types
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.types
@@ -15,8 +15,8 @@ var v = {
 >    : ^^^^^^
 
   return 12;
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
  }
 }
 
diff --git a/tests/baselines/reference/commentsOnStaticMembers.types b/tests/baselines/reference/commentsOnStaticMembers.types
index 9b2c25ff412..ca2397ecb13 100644
--- a/tests/baselines/reference/commentsOnStaticMembers.types
+++ b/tests/baselines/reference/commentsOnStaticMembers.types
@@ -11,8 +11,8 @@ class test {
     public static p1: string = "";
 >p1 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     /**
      * p2 comment does not appear in output
@@ -27,8 +27,8 @@ class test {
     private static p3: string = "";
 >p3 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     /**
      * p4 comment does not appear in output
diff --git a/tests/baselines/reference/commentsOverloads.types b/tests/baselines/reference/commentsOverloads.types
index d5aa9f008c2..2ab32c9fb47 100644
--- a/tests/baselines/reference/commentsOverloads.types
+++ b/tests/baselines/reference/commentsOverloads.types
@@ -28,16 +28,16 @@ f1("hello");
 >            : ^^^^^^
 >f1 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f1(10);
 >f1(10) : number
 >       : ^^^^^^
 >f1 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 function f2(a: number): number;
 >f2 : { (a: number): number; (b: string): number; }
@@ -67,16 +67,16 @@ f2("hello");
 >            : ^^^^^^
 >f2 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f2(10);
 >f2(10) : number
 >       : ^^^^^^
 >f2 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 function f3(a: number): number;
 >f3 : { (a: number): number; (b: string): number; }
@@ -104,16 +104,16 @@ f3("hello");
 >            : ^^^^^^
 >f3 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f3(10);
 >f3(10) : number
 >       : ^^^^^^
 >f3 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 /** this is signature 4 - with number parameter*/
 function f4(/**param a*/a: number): number;
@@ -143,16 +143,16 @@ f4("hello");
 >            : ^^^^^^
 >f4 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f4(10);
 >f4(10) : number
 >       : ^^^^^^
 >f4 : { (a: number): number; (b: string): number; }
 >   : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 interface i1 {
     /**this signature 1*/
@@ -536,8 +536,8 @@ var c1_i_1 = new c1(10);
 >           : ^^
 >c1 : typeof c1
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c1_i_2 = new c1("hello");
 >c1_i_2 : c1
@@ -546,8 +546,8 @@ var c1_i_2 = new c1("hello");
 >                : ^^
 >c1 : typeof c1
 >   : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var c2_i_1 = new c2(10);
 >c2_i_1 : c2
@@ -556,8 +556,8 @@ var c2_i_1 = new c2(10);
 >           : ^^
 >c2 : typeof c2
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c2_i_2 = new c2("hello");
 >c2_i_2 : c2
@@ -566,8 +566,8 @@ var c2_i_2 = new c2("hello");
 >                : ^^
 >c2 : typeof c2
 >   : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var c3_i_1 = new c3(10);
 >c3_i_1 : c3
@@ -576,8 +576,8 @@ var c3_i_1 = new c3(10);
 >           : ^^
 >c3 : typeof c3
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c3_i_2 = new c3("hello");
 >c3_i_2 : c3
@@ -586,8 +586,8 @@ var c3_i_2 = new c3("hello");
 >                : ^^
 >c3 : typeof c3
 >   : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var c4_i_1 = new c4(10);
 >c4_i_1 : c4
@@ -596,8 +596,8 @@ var c4_i_1 = new c4(10);
 >           : ^^
 >c4 : typeof c4
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c4_i_2 = new c4("hello");
 >c4_i_2 : c4
@@ -606,8 +606,8 @@ var c4_i_2 = new c4("hello");
 >                : ^^
 >c4 : typeof c4
 >   : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var c5_i_1 = new c5(10);
 >c5_i_1 : c5
@@ -616,8 +616,8 @@ var c5_i_1 = new c5(10);
 >           : ^^
 >c5 : typeof c5
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c5_i_2 = new c5("hello");
 >c5_i_2 : c5
@@ -626,6 +626,6 @@ var c5_i_2 = new c5("hello");
 >                : ^^
 >c5 : typeof c5
 >   : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types
index 6787ceb9b81..2a976739e0d 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.types
+++ b/tests/baselines/reference/commentsdoNotEmitComments.types
@@ -26,8 +26,8 @@ foo(50);
 >        : ^^^^
 >foo : (p: number) => void
 >    : ^ ^^      ^^^^^^^^^
->50 : number
->   : ^^^^^^
+>50 : 50
+>   : ^^
 
 fooVar();
 >fooVar() : void
diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types
index 292074970f7..e9736dd5447 100644
--- a/tests/baselines/reference/commentsemitComments.types
+++ b/tests/baselines/reference/commentsemitComments.types
@@ -26,8 +26,8 @@ foo(50);
 >        : ^^^^
 >foo : (p: number) => void
 >    : ^ ^^      ^^^^^^^^^
->50 : number
->   : ^^^^^^
+>50 : 50
+>   : ^^
 
 fooVar();
 >fooVar() : void
diff --git a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
index ab874a0c898..31b953eefc7 100644
--- a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
+++ b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
@@ -26,8 +26,8 @@ x > <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x > <BrandedNum>0;
 >x > <BrandedNum>0 : boolean
@@ -55,8 +55,8 @@ x < <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x < <BrandedNum>0;
 >x < <BrandedNum>0 : boolean
@@ -84,8 +84,8 @@ x >= <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x >= <BrandedNum>0;
 >x >= <BrandedNum>0 : boolean
@@ -113,8 +113,8 @@ x <= <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x <= <BrandedNum>0;
 >x <= <BrandedNum>0 : boolean
@@ -142,8 +142,8 @@ x == <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x == <BrandedNum>0;
 >x == <BrandedNum>0 : boolean
@@ -171,8 +171,8 @@ x != <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x != <BrandedNum>0;
 >x != <BrandedNum>0 : boolean
@@ -200,8 +200,8 @@ x === <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x === <BrandedNum>0;
 >x === <BrandedNum>0 : boolean
@@ -229,8 +229,8 @@ x !== <number>0;
 >  : ^^^^^^^^^^
 ><number>0 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x !== <BrandedNum>0;
 >x !== <BrandedNum>0 : boolean
diff --git a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
index bb9fd927d8f..bfb1d6d7465 100644
--- a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
+++ b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
@@ -102,16 +102,16 @@ const newTextChannel = makeNewChannel('text');
 
 // This should work
 newTextChannel.phoneNumber = '613-555-1234';
->newTextChannel.phoneNumber = '613-555-1234' : string
->                                            : ^^^^^^
+>newTextChannel.phoneNumber = '613-555-1234' : "613-555-1234"
+>                                            : ^^^^^^^^^^^^^^
 >newTextChannel.phoneNumber : string
 >                           : ^^^^^^
 >newTextChannel : NewChannel<TextChannel>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^
 >phoneNumber : string
 >            : ^^^^^^
->'613-555-1234' : string
->               : ^^^^^^
+>'613-555-1234' : "613-555-1234"
+>               : ^^^^^^^^^^^^^^
 
 const newTextChannel2 : NewChannel<TextChannel> = makeNewChannel('text');
 >newTextChannel2 : NewChannel<TextChannel>
@@ -125,14 +125,14 @@ const newTextChannel2 : NewChannel<TextChannel> = makeNewChannel('text');
 
 // Compare with this, which ofc works.
 newTextChannel2.phoneNumber = '613-555-1234';
->newTextChannel2.phoneNumber = '613-555-1234' : string
->                                             : ^^^^^^
+>newTextChannel2.phoneNumber = '613-555-1234' : "613-555-1234"
+>                                             : ^^^^^^^^^^^^^^
 >newTextChannel2.phoneNumber : string
 >                            : ^^^^^^
 >newTextChannel2 : NewChannel<TextChannel>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^
 >phoneNumber : string
 >            : ^^^^^^
->'613-555-1234' : string
->               : ^^^^^^
+>'613-555-1234' : "613-555-1234"
+>               : ^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/complicatedIndexesOfIntersectionsAreInferencable.types b/tests/baselines/reference/complicatedIndexesOfIntersectionsAreInferencable.types
index cc9dd199729..f1114d508ac 100644
--- a/tests/baselines/reference/complicatedIndexesOfIntersectionsAreInferencable.types
+++ b/tests/baselines/reference/complicatedIndexesOfIntersectionsAreInferencable.types
@@ -47,8 +47,8 @@ Func({
         foo: ""
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     },
     validate: props => {
diff --git a/tests/baselines/reference/computedEnumTypeWidening.types b/tests/baselines/reference/computedEnumTypeWidening.types
index 1d6aed1c6fd..6fa088fdad9 100644
--- a/tests/baselines/reference/computedEnumTypeWidening.types
+++ b/tests/baselines/reference/computedEnumTypeWidening.types
@@ -18,8 +18,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     B = computed(1),
 >B : E.B
@@ -28,8 +28,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     C = computed(2),
 >C : E.C
@@ -38,8 +38,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     D = computed(3),
 >D : E.D
@@ -48,8 +48,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 }
 
 function f1() {
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.types b/tests/baselines/reference/computedPropertiesInDestructuring1.types
index 51386bf58ab..ed398829a4b 100644
--- a/tests/baselines/reference/computedPropertiesInDestructuring1.types
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1.types
@@ -213,8 +213,8 @@ let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
 >             : ^^^^^^^^^^^^^^^^
 >bar : string
 >    : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 ({[foo2()]: bar3} = {bar: "bar"});
 >({[foo2()]: bar3} = {bar: "bar"}) : { bar: string; }
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types
index 32a3cd620ee..bb5f7bf36b8 100644
--- a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types
@@ -225,8 +225,8 @@ let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
 >             : ^^^^^^^^^^^^^^^^
 >bar : string
 >    : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 ({[foo2()]: bar3} = {bar: "bar"});
 >({[foo2()]: bar3} = {bar: "bar"}) : { bar: string; }
diff --git a/tests/baselines/reference/computedPropertyName.types b/tests/baselines/reference/computedPropertyName.types
index cd3971d7b73..bad69ad360f 100644
--- a/tests/baselines/reference/computedPropertyName.types
+++ b/tests/baselines/reference/computedPropertyName.types
@@ -8,8 +8,8 @@ export const onInit = Symbol("onInit");
 >                 : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"onInit" : string
->         : ^^^^^^
+>"onInit" : "onInit"
+>         : ^^^^^^^^
 
 === component.ts ===
 import type { onInit } from "./framework-hooks";
diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.types b/tests/baselines/reference/computedPropertyNames48_ES5.types
index 68bac28e14f..c3729ec41f0 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES5.types
@@ -30,8 +30,8 @@ extractIndexer({
 >[a] : string
 >    : ^^^^^^
 >a : any
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 }); // Should return string
 
@@ -52,8 +52,8 @@ extractIndexer({
 >  : ^^^^^^^^
 >x : E
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 }); // Should return string
 
@@ -74,7 +74,7 @@ extractIndexer({
 >   : ^^
 >0 : 0
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 }); // Should return any (widened form of undefined)
diff --git a/tests/baselines/reference/computedPropertyNames48_ES6.types b/tests/baselines/reference/computedPropertyNames48_ES6.types
index a0d5fa90311..4c0d97a7815 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES6.types
@@ -30,8 +30,8 @@ extractIndexer({
 >[a] : string
 >    : ^^^^^^
 >a : any
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 }); // Should return string
 
@@ -52,8 +52,8 @@ extractIndexer({
 >  : ^^^^^^^^
 >x : E
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 }); // Should return string
 
@@ -74,7 +74,7 @@ extractIndexer({
 >   : ^^
 >0 : 0
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 }); // Should return any (widened form of undefined)
diff --git a/tests/baselines/reference/computedPropertyNames9_ES5.types b/tests/baselines/reference/computedPropertyNames9_ES5.types
index 57d97dbb3c2..a6307cdf10b 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames9_ES5.types
@@ -38,8 +38,8 @@ var v = {
 >      : ^^^^^^
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
 >  : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^ ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >0 : 0
 >  : ^
 
@@ -50,8 +50,8 @@ var v = {
 >     : ^^^^^^
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
 >  : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^ ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >0 : 0
 >  : ^
 
diff --git a/tests/baselines/reference/computedPropertyNames9_ES6.types b/tests/baselines/reference/computedPropertyNames9_ES6.types
index 1a28e5fe84c..f4113d070a5 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames9_ES6.types
@@ -38,8 +38,8 @@ var v = {
 >      : ^^^^^^
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
 >  : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^ ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >0 : 0
 >  : ^
 
@@ -50,8 +50,8 @@ var v = {
 >     : ^^^^^^
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
 >  : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^ ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >0 : 0
 >  : ^
 
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
index 9823649c963..46a48f1958f 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
@@ -66,7 +66,7 @@ foo({
 >     : ^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 });
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
index 630eec98ca1..5a92a5e64cb 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
@@ -66,7 +66,7 @@ foo({
 >     : ^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 });
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
index 2f6ec2b85e3..a66a079a392 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
@@ -71,8 +71,8 @@ foo({
 >     : ^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 });
 
@@ -85,6 +85,6 @@ g({ p: "" });
 >          : ^^^^^^^^^^^^^^
 >p : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
index 42f7d8476a2..7598bb927f0 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
@@ -71,8 +71,8 @@ foo({
 >     : ^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 });
 
@@ -85,6 +85,6 @@ g({ p: "" });
 >          : ^^^^^^^^^^^^^^
 >p : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/concatError.types b/tests/baselines/reference/concatError.types
index 9a4b82129c2..e4de328530b 100644
--- a/tests/baselines/reference/concatError.types
+++ b/tests/baselines/reference/concatError.types
@@ -30,8 +30,8 @@ fa = fa.concat([0]);
 >       : ^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 fa = fa.concat(0);
 >fa = fa.concat(0) : number[]
diff --git a/tests/baselines/reference/concatTuples.types b/tests/baselines/reference/concatTuples.types
index 7e33b0da4b6..bcf330f4e7e 100644
--- a/tests/baselines/reference/concatTuples.types
+++ b/tests/baselines/reference/concatTuples.types
@@ -8,10 +8,10 @@ let ijs: [number, number][] = [[1, 2]];
 >         : ^^^^^^^^^^^^^^^^^^
 >[1, 2] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 ijs = ijs.concat([[3, 4], [5, 6]]);
 >ijs = ijs.concat([[3, 4], [5, 6]]) : [number, number][]
@@ -30,14 +30,14 @@ ijs = ijs.concat([[3, 4], [5, 6]]);
 >                 : ^^^^^^^^^^^^^^^^^^
 >[3, 4] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 >[5, 6] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
diff --git a/tests/baselines/reference/conditionalDoesntLeakUninstantiatedTypeParameter.types b/tests/baselines/reference/conditionalDoesntLeakUninstantiatedTypeParameter.types
index f6bb51d699c..7fae7322b30 100644
--- a/tests/baselines/reference/conditionalDoesntLeakUninstantiatedTypeParameter.types
+++ b/tests/baselines/reference/conditionalDoesntLeakUninstantiatedTypeParameter.types
@@ -15,12 +15,12 @@ type TestSynthetic = // Resolved to T, should be `number` or an inference failur
 const y: TestSynthetic = 3; // Type '3' is not assignable to type 'T'. (shouldn't error)
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 const z: TestSynthetic = '3'; // Type '"3""' is not assignable to type 'T'. (should not mention T)
 >z : number
 >  : ^^^^^^
->'3' : string
->    : ^^^^^^
+>'3' : "3"
+>    : ^^^
 
diff --git a/tests/baselines/reference/conditionalTypeAssignabilityWhenDeferred.types b/tests/baselines/reference/conditionalTypeAssignabilityWhenDeferred.types
index b1a7fb58571..1667b2a0395 100644
--- a/tests/baselines/reference/conditionalTypeAssignabilityWhenDeferred.types
+++ b/tests/baselines/reference/conditionalTypeAssignabilityWhenDeferred.types
@@ -403,8 +403,8 @@ set(new Foo2(), "prop", "hi"); // <-- typechecks
 >     : ^^^^^^^^^^^
 >"prop" : "prop"
 >       : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 type InferBecauseWhyNot<T> = [T] extends [(p: infer P1) => any]
 >InferBecauseWhyNot : InferBecauseWhyNot<T>
diff --git a/tests/baselines/reference/conditionalTypeDoesntSpinForever.types b/tests/baselines/reference/conditionalTypeDoesntSpinForever.types
index 1013ea24cbb..73fb1f2d6e1 100644
--- a/tests/baselines/reference/conditionalTypeDoesntSpinForever.types
+++ b/tests/baselines/reference/conditionalTypeDoesntSpinForever.types
@@ -518,8 +518,8 @@ export enum PubSubRecordIsStoredInRedisAsA {
 >                                                                                                                                                                                                   : ^        ^^^      ^^^^^                                                                        
 >instance : number
 >         : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         buildPubSubRecordType(Object.assign({}, soFar, {maxMsToWaitBeforePublishing: instance})) as BuildPubSubRecordType<SO_FAR & {maxMsToWaitBeforePublishing: number}>,
 >buildPubSubRecordType(Object.assign({}, soFar, {maxMsToWaitBeforePublishing: instance})) as BuildPubSubRecordType<SO_FAR & {maxMsToWaitBeforePublishing: number}> : BuildPubSubRecordType<SO_FAR & { maxMsToWaitBeforePublishing: number; }>
@@ -578,8 +578,8 @@ export enum PubSubRecordIsStoredInRedisAsA {
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >maxMsToWaitBeforePublishing : number
 >                            : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >maxMsToWaitBeforePublishing : 0
 >                            : ^
     }
diff --git a/tests/baselines/reference/conditionalTypeRelaxingConstraintAssignability.types b/tests/baselines/reference/conditionalTypeRelaxingConstraintAssignability.types
index 7907616477f..b9fd8f33988 100644
--- a/tests/baselines/reference/conditionalTypeRelaxingConstraintAssignability.types
+++ b/tests/baselines/reference/conditionalTypeRelaxingConstraintAssignability.types
@@ -65,8 +65,8 @@ new Elem('' as ElChildren.Text);
 >     : ^^^^^^^^^^^
 >'' as ElChildren.Text : string
 >                      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >ElChildren : any
 >           : ^^^
 
@@ -77,8 +77,8 @@ new Elem('' as ElChildren.Void | ElChildren.Text); // error
 >     : ^^^^^^^^^^^
 >'' as ElChildren.Void | ElChildren.Text : string | undefined
 >                                        : ^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >ElChildren : any
 >           : ^^^
 >ElChildren : any
@@ -91,8 +91,8 @@ new Elem('' as ElChildren); // error
 >     : ^^^^^^^^^^^
 >'' as ElChildren : ElChildren
 >                 : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // Repro from #31766
 
diff --git a/tests/baselines/reference/conditionalTypes1.types b/tests/baselines/reference/conditionalTypes1.types
index 9faaf2d0ade..3aac0bf5784 100644
--- a/tests/baselines/reference/conditionalTypes1.types
+++ b/tests/baselines/reference/conditionalTypes1.types
@@ -1584,8 +1584,8 @@ assign(a, {o: 2, c: {0: {a: 2, c: '213123'}}})
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >o : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >c : { 0: { a: number; c: string; }; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{0: {a: 2, c: '213123'}} : { 0: { a: number; c: string; }; }
@@ -1596,12 +1596,12 @@ assign(a, {o: 2, c: {0: {a: 2, c: '213123'}}})
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >c : string
 >  : ^^^^^^
->'213123' : string
->         : ^^^^^^
+>'213123' : "213123"
+>         : ^^^^^^^^
 
 // Repros from #23843
 
diff --git a/tests/baselines/reference/conditionalTypes2.types b/tests/baselines/reference/conditionalTypes2.types
index e258b5f30e7..da271b7a6f7 100644
--- a/tests/baselines/reference/conditionalTypes2.types
+++ b/tests/baselines/reference/conditionalTypes2.types
@@ -637,8 +637,8 @@ const w: What = { a: 4 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 // Repro from #33568
 
diff --git a/tests/baselines/reference/conditionalTypesExcessProperties.types b/tests/baselines/reference/conditionalTypesExcessProperties.types
index e4a5d8501a8..2deb2fb4648 100644
--- a/tests/baselines/reference/conditionalTypesExcessProperties.types
+++ b/tests/baselines/reference/conditionalTypesExcessProperties.types
@@ -35,8 +35,8 @@ function testFunc2<A extends object>(a: A, sa: Something<A>) {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >test : string
 >     : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 >arg : A
 >    : ^
 >a : A
@@ -51,8 +51,8 @@ function testFunc2<A extends object>(a: A, sa: Something<A>) {
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >test : string
 >     : ^^^^^^
->'bye' : string
->      : ^^^^^^
+>'bye' : "bye"
+>      : ^^^^^
 >arg : A
 >    : ^
 >a : A
diff --git a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
index f43c9a04390..9b9a2516470 100644
--- a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
+++ b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
@@ -19,8 +19,8 @@ class Rule {
     public name: string = '';
 >name : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     constructor(name: string) {
 >name : string
diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.types b/tests/baselines/reference/constDeclarations-ambient-errors.types
index 15006ffb0c5..bad179053eb 100644
--- a/tests/baselines/reference/constDeclarations-ambient-errors.types
+++ b/tests/baselines/reference/constDeclarations-ambient-errors.types
@@ -11,16 +11,16 @@ declare const c1: boolean = true;
 declare const c2: number = 0;
 >c2 : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 declare const c3 = null, c4 :string = "", c5: any = 0;
 >c3 : any
 >   : ^^^
 >c4 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >c5 : any
 >   : ^^^
 >0 : 0
@@ -39,6 +39,6 @@ declare module M {
     const c7: number = 7;
 >c7 : number
 >   : ^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 }
diff --git a/tests/baselines/reference/constDeclarations-es5.types b/tests/baselines/reference/constDeclarations-es5.types
index 9ee7602c9a5..cb068af0ec5 100644
--- a/tests/baselines/reference/constDeclarations-es5.types
+++ b/tests/baselines/reference/constDeclarations-es5.types
@@ -10,8 +10,8 @@ const z7 = false;
 const z8: number = 23;
 >z8 : number
 >   : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
 const z9 = 0, z10 :string = "", z11 = null;
 >z9 : 0
@@ -20,7 +20,7 @@ const z9 = 0, z10 :string = "", z11 = null;
 >  : ^
 >z10 : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >z11 : any
 
diff --git a/tests/baselines/reference/constDeclarations.types b/tests/baselines/reference/constDeclarations.types
index 1efd065cf3d..ab50c65ed5e 100644
--- a/tests/baselines/reference/constDeclarations.types
+++ b/tests/baselines/reference/constDeclarations.types
@@ -11,8 +11,8 @@ const c1 = false;
 const c2: number = 23;
 >c2 : number
 >   : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
 const c3 = 0, c4 :string = "", c5 = null;
 >c3 : 0
@@ -21,8 +21,8 @@ const c3 = 0, c4 :string = "", c5 = null;
 >  : ^
 >c4 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >c5 : any
 
 
diff --git a/tests/baselines/reference/constDeclarations2.types b/tests/baselines/reference/constDeclarations2.types
index bd4bd35f976..8a0e3d877f6 100644
--- a/tests/baselines/reference/constDeclarations2.types
+++ b/tests/baselines/reference/constDeclarations2.types
@@ -15,8 +15,8 @@ module M {
     export const c2: number = 23;
 >c2 : number
 >   : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
     export const c3 = 0, c4 :string = "", c5 = null;
 >c3 : 0
@@ -25,8 +25,8 @@ module M {
 >  : ^
 >c4 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >c5 : any
 }
 
diff --git a/tests/baselines/reference/constEnums.types b/tests/baselines/reference/constEnums.types
index a7429e17131..bdc233f233f 100644
--- a/tests/baselines/reference/constEnums.types
+++ b/tests/baselines/reference/constEnums.types
@@ -935,8 +935,8 @@ function bar(e: A.B.C.E): number {
 >  : ^^^^^^^^
 >V1 : I.V1
 >   : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         case A.B.C.E.V2: return 1;
 >A.B.C.E.V2 : I.V2
@@ -957,8 +957,8 @@ function bar(e: A.B.C.E): number {
 >  : ^^^^^^^^
 >V2 : I.V2
 >   : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         case A.B.C.E.V3: return 1;
 >A.B.C.E.V3 : I.V3
@@ -979,8 +979,8 @@ function bar(e: A.B.C.E): number {
 >  : ^^^^^^^^
 >V3 : I.V3
 >   : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
index ea76cca9e51..41d74877dba 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
@@ -97,8 +97,8 @@ module MemberWithConstructSignature {
 >  : ^^^^
 >a : new (x: number) => void
 >  : ^^^^^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     // S's
     interface I extends Base {
diff --git a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
index 7f36bdf2364..ea87c3c3f0d 100644
--- a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
+++ b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
@@ -31,10 +31,10 @@ var r1 = new C(1, '');
 >             : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 class C2<T> {
 >C2 : C2<T>
@@ -64,10 +64,10 @@ var r2 = new C2(1, '');
 >              : ^^^^^^^^^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 interface I {
     new (x: number, y: string): C;
@@ -94,10 +94,10 @@ var r3 = new i(1, '');
 >             : ^
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 interface I2<T> {
     new (x: T, y: string): C2<T>;
@@ -136,10 +136,10 @@ var r4 = new i2(1, '');
 >              : ^^^^^^^^^^
 >i2 : I2<number>
 >   : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var a: {
 >a : { new (x: number, y: string): C; new (x: number, y: string): C; }
@@ -165,10 +165,10 @@ var r5 = new a(1, '');
 >             : ^
 >a : { new (x: number, y: string): C; new (x: number, y: string): C; }
 >  : ^^^^^^^ ^^      ^^ ^^      ^^^ ^^^^^^^ ^^      ^^ ^^      ^^^ ^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var b: {
 >b : { new <T>(x: T, y: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
@@ -194,8 +194,8 @@ var r6 = new b(1, '');
 >             : ^^^^^^^^^^
 >b : { new <T>(x: T, y: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
 >  : ^^^^^^^ ^^ ^^ ^^ ^^      ^^^     ^^^^^^^ ^^ ^^ ^^ ^^      ^^^     ^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads.types b/tests/baselines/reference/constructSignaturesWithOverloads.types
index 1e673c0beb4..6e52b77cec9 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloads.types
@@ -31,10 +31,10 @@ var r1 = new C(1, '');
 >             : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 class C2<T> {
 >C2 : C2<T>
@@ -64,10 +64,10 @@ var r2 = new C2(1, '');
 >              : ^^^^^^^^^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 interface I {
     new(x: number, y?: string): C;
@@ -94,10 +94,10 @@ var r3 = new i(1, '');
 >             : ^
 >i : I
 >  : ^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 interface I2<T> {
     new (x: T, y?: string): C2<T>;
@@ -137,10 +137,10 @@ var r4 = new i2(1, '');
 >              : ^^^^^^^^^^
 >i2 : I2<number>
 >   : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var a: {
 >a : { new (x: number, y?: string): C; new (x: number, y: string): C; }
@@ -166,10 +166,10 @@ var r5 = new a(1, '');
 >             : ^
 >a : { new (x: number, y?: string): C; new (x: number, y: string): C; }
 >  : ^^^^^^^ ^^      ^^ ^^^      ^^^ ^^^^^^^ ^^      ^^ ^^      ^^^ ^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var b: {
 >b : { new <T>(x: T, y?: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
@@ -195,8 +195,8 @@ var r6 = new b(1, '');
 >             : ^^^^^^^^^^
 >b : { new <T>(x: T, y?: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
 >  : ^^^^^^^ ^^ ^^ ^^ ^^^      ^^^     ^^^^^^^ ^^ ^^ ^^ ^^      ^^^     ^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.types b/tests/baselines/reference/constructSignaturesWithOverloads2.types
index 41611b513c7..c7ce6bd6d93 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.types
@@ -42,10 +42,10 @@ var r1 = new C(1, '');
 >             : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 class C2<T> {
 >C2 : C2<T>
@@ -85,10 +85,10 @@ var r2 = new C2(1, '');
 >              : ^^^^^^^^^^
 >C2 : typeof C2
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 // merged interfaces
 interface I {
@@ -130,10 +130,10 @@ var r4 = new i2(1, '');
 >              : ^
 >i2 : I<number>
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r5 = new i2(1, 1);
 >r5 : C2<number>
@@ -142,8 +142,8 @@ var r5 = new i2(1, 1);
 >             : ^^^^^^^^^^
 >i2 : I<number>
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/constructorFunctions2.types b/tests/baselines/reference/constructorFunctions2.types
index d67da68c920..0bd871bd0da 100644
--- a/tests/baselines/reference/constructorFunctions2.types
+++ b/tests/baselines/reference/constructorFunctions2.types
@@ -19,8 +19,8 @@ const A = require("./other");
 >                   : ^^^^^^^^
 >require : (id: string) => any
 >        : ^  ^^      ^^^^^   
->"./other" : string
->          : ^^^^^^
+>"./other" : "./other"
+>          : ^^^^^^^^^
 
 const a = new A().id;
 >a : number
diff --git a/tests/baselines/reference/constructorFunctions3.types b/tests/baselines/reference/constructorFunctions3.types
index ef80cce585d..ae55ec0cdce 100644
--- a/tests/baselines/reference/constructorFunctions3.types
+++ b/tests/baselines/reference/constructorFunctions3.types
@@ -178,8 +178,8 @@ a.z(3)
 >  : ^
 >z : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 A.t(2)
 >A.t(2) : number
@@ -190,8 +190,8 @@ A.t(2)
 >  : ^^^^^^^^
 >t : (m: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 a.second = 1
 >a.second = 1 : 1
diff --git a/tests/baselines/reference/constructorFunctionsStrict.types b/tests/baselines/reference/constructorFunctionsStrict.types
index f0465a76eca..4ef509fbea5 100644
--- a/tests/baselines/reference/constructorFunctionsStrict.types
+++ b/tests/baselines/reference/constructorFunctionsStrict.types
@@ -55,8 +55,8 @@ var c = new C(1)
 >         : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x = undefined // should error
 >c.x = undefined : undefined
@@ -128,8 +128,8 @@ var k = A(1)
 >     : ^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var j = new A(2)
 >j : A
@@ -138,8 +138,8 @@ var j = new A(2)
 >         : ^
 >A : typeof A
 >  : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 k.x === j.x
 >k.x === j.x : boolean
diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues2.types b/tests/baselines/reference/constructorImplementationWithDefaultValues2.types
index 9c0a54412e0..cfba195c7fb 100644
--- a/tests/baselines/reference/constructorImplementationWithDefaultValues2.types
+++ b/tests/baselines/reference/constructorImplementationWithDefaultValues2.types
@@ -12,8 +12,8 @@ class C {
     constructor(public x: string = 1) { // error
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         var y = x;
 >y : string
diff --git a/tests/baselines/reference/constructorOverloads1.types b/tests/baselines/reference/constructorOverloads1.types
index ff393896859..2dd77505ce2 100644
--- a/tests/baselines/reference/constructorOverloads1.types
+++ b/tests/baselines/reference/constructorOverloads1.types
@@ -39,8 +39,8 @@ var f1 = new Foo("hey");
 >               : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"hey" : string
->      : ^^^^^^
+>"hey" : "hey"
+>      : ^^^^^
 
 var f2 = new Foo(0);
 >f2 : Foo
@@ -49,8 +49,8 @@ var f2 = new Foo(0);
 >           : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var f3 = new Foo(f1);
 >f3 : Foo
diff --git a/tests/baselines/reference/constructorOverloads2.types b/tests/baselines/reference/constructorOverloads2.types
index 4dc49c0f9fa..720333be2ec 100644
--- a/tests/baselines/reference/constructorOverloads2.types
+++ b/tests/baselines/reference/constructorOverloads2.types
@@ -61,8 +61,8 @@ var f1 = new Foo("hey");
 >               : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"hey" : string
->      : ^^^^^^
+>"hey" : "hey"
+>      : ^^^^^
 
 var f2 = new Foo(0);
 >f2 : Foo
@@ -71,8 +71,8 @@ var f2 = new Foo(0);
 >           : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var f3 = new Foo(f1);
 >f3 : Foo
diff --git a/tests/baselines/reference/constructorOverloads3.types b/tests/baselines/reference/constructorOverloads3.types
index 6c9bb686db7..58e2da8d0e3 100644
--- a/tests/baselines/reference/constructorOverloads3.types
+++ b/tests/baselines/reference/constructorOverloads3.types
@@ -55,8 +55,8 @@ var f1 = new Foo("hey");
 >               : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"hey" : string
->      : ^^^^^^
+>"hey" : "hey"
+>      : ^^^^^
 
 var f2 = new Foo(0);
 >f2 : Foo
@@ -65,8 +65,8 @@ var f2 = new Foo(0);
 >           : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var f3 = new Foo(f1);
 >f3 : Foo
diff --git a/tests/baselines/reference/constructorOverloads4.types b/tests/baselines/reference/constructorOverloads4.types
index ddcbaf58287..5ef47e27acf 100644
--- a/tests/baselines/reference/constructorOverloads4.types
+++ b/tests/baselines/reference/constructorOverloads4.types
@@ -40,8 +40,8 @@ declare module M {
 >  : ^^^^^^^^
 >Function : typeof M.Function
 >         : ^^^^^^^^^^^^^^^^^
->"return 5" : string
->           : ^^^^^^
+>"return 5" : "return 5"
+>           : ^^^^^^^^^^
 
 M.Function("yo");
 >M.Function("yo") : any
diff --git a/tests/baselines/reference/constructorOverloads6.types b/tests/baselines/reference/constructorOverloads6.types
index 3af26305d94..d1a0e909ceb 100644
--- a/tests/baselines/reference/constructorOverloads6.types
+++ b/tests/baselines/reference/constructorOverloads6.types
@@ -55,8 +55,8 @@ var f1 = new Foo("hey");
 >               : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->"hey" : string
->      : ^^^^^^
+>"hey" : "hey"
+>      : ^^^^^
 
 var f2 = new Foo(0);
 >f2 : Foo
@@ -65,8 +65,8 @@ var f2 = new Foo(0);
 >           : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var f3 = new Foo(f1);
 >f3 : Foo
diff --git a/tests/baselines/reference/constructorParameterShadowsOuterScopes.types b/tests/baselines/reference/constructorParameterShadowsOuterScopes.types
index 40868587227..cb4dbc86dcf 100644
--- a/tests/baselines/reference/constructorParameterShadowsOuterScopes.types
+++ b/tests/baselines/reference/constructorParameterShadowsOuterScopes.types
@@ -27,12 +27,12 @@ class C {
 >  : ^^^^^^
 
         x = 2; // error, x is string
->x = 2 : number
->      : ^^^^^^
+>x = 2 : 2
+>      : ^
 >x : string
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }    
 }
 
diff --git a/tests/baselines/reference/constructorWithAssignableReturnExpression.types b/tests/baselines/reference/constructorWithAssignableReturnExpression.types
index c8d78f023ff..0b1c03a6133 100644
--- a/tests/baselines/reference/constructorWithAssignableReturnExpression.types
+++ b/tests/baselines/reference/constructorWithAssignableReturnExpression.types
@@ -43,8 +43,8 @@ class E {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index 90bb21327ef..1732ef9e66d 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -61,8 +61,8 @@ module TypeScriptAllInOne {
                 var retValue: number = 0;
 >retValue : number
 >         : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
                 retValue = bfs.VARIABLES();
 >retValue = bfs.VARIABLES() : number
@@ -390,12 +390,12 @@ module TypeScriptAllInOne {
 >                                                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"var" : number
 >      : ^^^^^^
->number = 42 : number
->            : ^^^^^^
+>number = 42 : 42
+>            : ^^
 >number : number
 >       : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >equals : (x: any) => boolean
 >       : ^ ^^^^^^^^^^^^^^^^^
 >function (x) { return x["var"] === 42; } : (x: any) => boolean
@@ -677,8 +677,8 @@ module TypeScriptAllInOne {
 >      : ^^^^^^
 
             return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
 
         /// <summary>
@@ -707,21 +707,21 @@ module TypeScriptAllInOne {
 >  : ^
 
                 retVal = 1;
->retVal = 1 : number
->           : ^^^^^^
+>retVal = 1 : 1
+>           : ^
 >retVal : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             else
                 retVal = 0;
->retVal = 0 : number
->           : ^^^^^^
+>retVal = 0 : 0
+>           : ^
 >retVal : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
             switch (i) {
 >i : number
@@ -732,12 +732,12 @@ module TypeScriptAllInOne {
 >  : ^
 
                     retVal = 1;
->retVal = 1 : number
->           : ^^^^^^
+>retVal = 1 : 1
+>           : ^
 >retVal : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
                     break;
                 case 3:
@@ -745,12 +745,12 @@ module TypeScriptAllInOne {
 >  : ^
 
                     retVal = 1;
->retVal = 1 : number
->           : ^^^^^^
+>retVal = 1 : 1
+>           : ^
 >retVal : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
                     break;
                 default:
@@ -919,16 +919,16 @@ module TypeScriptAllInOne {
 >  : ^^^^^^^^
 >[1, 2, 3, 4, 5, ] : number[]
 >                  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
 
             var i = a[1];/*[]*/
 >i : number
@@ -1163,8 +1163,8 @@ module TypeScriptAllInOne {
 >  : ^^^^^^
 ><number>5.0 : number
 >            : ^^^^^^
->5.0 : number
->    : ^^^^^^
+>5.0 : 5
+>    : ^
 
             i -= i;/*-=*/
 >i -= i : number
@@ -1277,12 +1277,12 @@ module TypeScriptAllInOne {
 >  : ^
 
                 return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
             else return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
 
     }
diff --git a/tests/baselines/reference/contextualComputedNonBindablePropertyType.types b/tests/baselines/reference/contextualComputedNonBindablePropertyType.types
index 97f92811d08..60cbbb55f96 100644
--- a/tests/baselines/reference/contextualComputedNonBindablePropertyType.types
+++ b/tests/baselines/reference/contextualComputedNonBindablePropertyType.types
@@ -142,7 +142,7 @@ const unexpectedlyFailingExample: Mapped = {
 >               : ^   ^^^^^^^^^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->51345 : number
->      : ^^^^^^
+>51345 : 51345
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/contextualOverloadListFromArrayUnion.types b/tests/baselines/reference/contextualOverloadListFromArrayUnion.types
index 409827c2a23..77298efc245 100644
--- a/tests/baselines/reference/contextualOverloadListFromArrayUnion.types
+++ b/tests/baselines/reference/contextualOverloadListFromArrayUnion.types
@@ -238,10 +238,10 @@ series([
 >            : ^^^^^^^
 >cb : Callback<unknown>
 >   : ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->300 : number
->    : ^^^^^^
+>1 : 1
+>  : ^
+>300 : 300
+>    : ^^^
 
     cb => setTimeout(() => cb(null, 2), 200),
 >cb => setTimeout(() => cb(null, 2), 200) : (cb: Callback<unknown>) => number
@@ -258,10 +258,10 @@ series([
 >            : ^^^^^^^
 >cb : Callback<unknown>
 >   : ^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->200 : number
->    : ^^^^^^
+>2 : 2
+>  : ^
+>200 : 200
+>    : ^^^
 
     cb => setTimeout(() => cb(null, 3), 100),
 >cb => setTimeout(() => cb(null, 3), 100) : (cb: Callback<unknown>) => number
@@ -278,10 +278,10 @@ series([
 >            : ^^^^^^^
 >cb : Callback<unknown>
 >   : ^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->100 : number
->    : ^^^^^^
+>3 : 3
+>  : ^
+>100 : 100
+>    : ^^^
 
 ], (error, results) => {
 >(error, results) => {    if (error) {        console.error(error)    } else {        console.log(results)    }} : (error: Error | null, results: unknown[] | null) => void
diff --git a/tests/baselines/reference/contextualPropertyOfGenericMappedType.types b/tests/baselines/reference/contextualPropertyOfGenericMappedType.types
index a70578e2de6..193315b5625 100644
--- a/tests/baselines/reference/contextualPropertyOfGenericMappedType.types
+++ b/tests/baselines/reference/contextualPropertyOfGenericMappedType.types
@@ -24,8 +24,8 @@ f({ data: 0 }, { data(value, key) {} });
 >            : ^^^^^^^^^^^^^^^^^
 >data : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ data(value, key) {} } : { data(value: number, key: "data"): void; }
 >                        : ^^^^^^^     ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^
 >data : (value: number, key: "data") => void
diff --git a/tests/baselines/reference/contextualReturnTypeOfIIFE.types b/tests/baselines/reference/contextualReturnTypeOfIIFE.types
index 25c8f7ea945..30826b407b1 100644
--- a/tests/baselines/reference/contextualReturnTypeOfIIFE.types
+++ b/tests/baselines/reference/contextualReturnTypeOfIIFE.types
@@ -14,10 +14,10 @@ const test1: Promise<[one: number, two: string]> = (async () => {
     return [1, 'two'];
 >[1, 'two'] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'two' : "two"
+>      : ^^^^^
 
 })();
 
@@ -40,10 +40,10 @@ const test2: Promise<[one: number, two: string]> = new Promise(
 >        : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >[1, 'two'] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'two' : "two"
+>      : ^^^^^
 
 );
 
@@ -66,10 +66,10 @@ const obj: { foo: [one: number, two: string] } = {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
 >[1, 'two'] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'two' : "two"
+>      : ^^^^^
 
 };
 
diff --git a/tests/baselines/reference/contextualReturnTypeOfIIFE2.types b/tests/baselines/reference/contextualReturnTypeOfIIFE2.types
index 66f6fc7d847..efd9dd64e61 100644
--- a/tests/baselines/reference/contextualReturnTypeOfIIFE2.types
+++ b/tests/baselines/reference/contextualReturnTypeOfIIFE2.types
@@ -63,6 +63,6 @@ app.foo.bar.someFun(1);
 >    : ^^^^^^^^^^^^   ^^      ^^^^^^^^^^^^
 >someFun : (arg: number) => void
 >        : ^   ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/contextualReturnTypeOfIIFE3.types b/tests/baselines/reference/contextualReturnTypeOfIIFE3.types
index 42c3586a8b4..4012e250b45 100644
--- a/tests/baselines/reference/contextualReturnTypeOfIIFE3.types
+++ b/tests/baselines/reference/contextualReturnTypeOfIIFE3.types
@@ -70,6 +70,6 @@ app.foo.bar.someFun(1);
 >    : ^^^^^^^^^^^                     ^^^
 >someFun : (arg: number) => void
 >        : ^   ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiation.types b/tests/baselines/reference/contextualSignatureInstantiation.types
index 2881e7960cb..8b2fb9e27a5 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation.types
@@ -72,10 +72,10 @@ var a = bar(1, 1, g);      // Should be number
 >             : ^^^^^^
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^  ^^                 ^^^^^ 
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 >g : <T>(x: T, y: T) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^^^^ 
 
@@ -86,10 +86,10 @@ var a = baz(1, 1, g);      // Should be number
 >             : ^^^^^^
 >baz : <T, U>(x: T, y: T, cb: (x: T, y: T) => U) => U
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^  ^^                 ^^^^^ 
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 >g : <T>(x: T, y: T) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^^^^ 
 
@@ -114,10 +114,10 @@ var b = bar(1, "one", g);  // Error, number and string are disjoint types
 >                 : ^^^^^^^
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^  ^^                 ^^^^^ 
->1 : number
->  : ^^^^^^
->"one" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>"one" : "one"
+>      : ^^^^^
 >g : <T>(x: T, y: T) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^^^^ 
 
@@ -128,10 +128,10 @@ var b = bar("one", 1, g);  // Error, number and string are disjoint types
 >                 : ^^^^^^^
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^  ^^                 ^^^^^ 
->"one" : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
+>1 : 1
+>  : ^
 >g : <T>(x: T, y: T) => T
 >  : ^ ^^ ^^ ^^ ^^ ^^^^^ 
 
@@ -170,10 +170,10 @@ var d = bar(1, "one", h);  // Should be number[] | string[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^  ^^                 ^^^^^ 
->1 : number
->  : ^^^^^^
->"one" : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>"one" : "one"
+>      : ^^^^^
 >h : <T, U>(x: T, y: U) => T[] | U[]
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^         
 
@@ -184,10 +184,10 @@ var d = bar("one", 1, h);  // Should be number[] | string[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^  ^^                 ^^^^^ 
->"one" : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
+>1 : 1
+>  : ^
 >h : <T, U>(x: T, y: U) => T[] | U[]
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^         
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
index c450b47bb80..1f4617bae40 100644
--- a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -32,8 +32,8 @@ var x = h("", f<string>()); // Call should succeed and x should be string. All t
 >                   : ^^^^^^
 >h : <V, W>(v: V, func: (v: V) => W) => W
 >  : ^ ^^ ^^ ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >f<string>() : <U extends string>(u: U) => U
 >            : ^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^
 >f : <T>() => <U extends T>(u: U) => U
diff --git a/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types b/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types
index 8e16c012a01..b48905f0b05 100644
--- a/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types
+++ b/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types
@@ -16,6 +16,6 @@ const o: I = { m() { throw new Error("not implemented"); } };
 >                             : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"not implemented" : string
->                  : ^^^^^^
+>"not implemented" : "not implemented"
+>                  : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/contextualTypeAny.types b/tests/baselines/reference/contextualTypeAny.types
index c0a73825c93..83d0ea51a44 100644
--- a/tests/baselines/reference/contextualTypeAny.types
+++ b/tests/baselines/reference/contextualTypeAny.types
@@ -14,8 +14,8 @@ var obj: { [s: string]: number } = { p: "", q: x };
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >p : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >q : any
 >  : ^^^
 >x : any
@@ -26,8 +26,8 @@ var arr: number[] = ["", x];
 >    : ^^^^^^^^
 >["", x] : any[]
 >        : ^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/contextualTypeFromJSDoc.types b/tests/baselines/reference/contextualTypeFromJSDoc.types
index ac6c3075992..e96f075e12e 100644
--- a/tests/baselines/reference/contextualTypeFromJSDoc.types
+++ b/tests/baselines/reference/contextualTypeFromJSDoc.types
@@ -11,26 +11,26 @@ const arr = [
     ['a', { x: 1 }],
 >['a', { x: 1 }] : [string, { x: number; }]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >{ x: 1 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     ['b', { y: 2 }]
 >['b', { y: 2 }] : [string, { y: number; }]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >{ y: 2 } : { y: number; }
 >         : ^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 ];
 
@@ -46,26 +46,26 @@ function f() {
         ['a', { x: 1 }],
 >['a', { x: 1 }] : [string, { x: number; }]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >{ x: 1 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         ['b', { y: 2 }]
 >['b', { y: 2 }] : [string, { y: number; }]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >{ y: 2 } : { y: number; }
 >         : ^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     ];
 }
@@ -92,26 +92,26 @@ class C {
             ['a', { x: 1 }],
 >['a', { x: 1 }] : [string, { x: number; }]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >{ x: 1 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             ['b', { y: 2 }]
 >['b', { y: 2 }] : [string, { y: number; }]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >{ y: 2 } : { y: number; }
 >         : ^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ];
     }
diff --git a/tests/baselines/reference/contextualTypeIterableUnions.types b/tests/baselines/reference/contextualTypeIterableUnions.types
index 681d5de8b45..df8c6a25e18 100644
--- a/tests/baselines/reference/contextualTypeIterableUnions.types
+++ b/tests/baselines/reference/contextualTypeIterableUnions.types
@@ -18,10 +18,10 @@ new DMap([["1", 2]]);
 >           : ^^^^^^^^^^^^^^^^^^
 >["1", 2] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->"1" : string
->    : ^^^^^^
->2 : number
->  : ^^^^^^
+>"1" : "1"
+>    : ^^^
+>2 : 2
+>  : ^
 
 const i1: Iterable<{ a: true }> | undefined = [{ a: true }];
 >i1 : Iterable<{ a: true; }> | undefined
diff --git a/tests/baselines/reference/contextualTypeLogicalOr.types b/tests/baselines/reference/contextualTypeLogicalOr.types
index 78e8efd4958..d229dac24ec 100644
--- a/tests/baselines/reference/contextualTypeLogicalOr.types
+++ b/tests/baselines/reference/contextualTypeLogicalOr.types
@@ -60,14 +60,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -76,14 +76,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -92,14 +92,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -108,14 +108,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -124,14 +124,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -140,14 +140,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -156,14 +156,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -172,14 +172,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -188,14 +188,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -204,14 +204,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4] ||
 >x && [1, 2, 3, 4] : number[]
@@ -220,14 +220,14 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     x && [1, 2, 3, 4];
 >x && [1, 2, 3, 4] : number[]
@@ -236,12 +236,12 @@ var a =
 >  : ^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTypeShouldBeLiteral.types b/tests/baselines/reference/contextualTypeShouldBeLiteral.types
index 478af45d83d..3688ae417f3 100644
--- a/tests/baselines/reference/contextualTypeShouldBeLiteral.types
+++ b/tests/baselines/reference/contextualTypeShouldBeLiteral.types
@@ -202,8 +202,8 @@ let xy: X3 | Y3 = {
     ytra: 12
 >ytra : number
 >     : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 };
 
@@ -269,8 +269,8 @@ let xyz: LikeA | LikeB = {
     value: "foo",
 >value : string
 >      : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
     method() {
 >method : () => void
diff --git a/tests/baselines/reference/contextualTypeWithTuple.types b/tests/baselines/reference/contextualTypeWithTuple.types
index 07735bd4c78..af3f3025b8c 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.types
+++ b/tests/baselines/reference/contextualTypeWithTuple.types
@@ -7,20 +7,20 @@ var numStrTuple: [number, string] = [5, "hello"];
 >            : ^^^^^^^^^^^^^^^^
 >[5, "hello"] : [number, string]
 >             : ^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>5 : 5
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var numStrTuple2: [number, string] = [5, "foo", true];
 >numStrTuple2 : [number, string]
 >             : ^^^^^^^^^^^^^^^^
 >[5, "foo", true] : [number, string, boolean]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>5 : 5
+>  : ^
+>"foo" : "foo"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -29,10 +29,10 @@ var numStrBoolTuple: [number, string, boolean] = [5, "foo", true];
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[5, "foo", true] : [number, string, true]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>5 : 5
+>  : ^
+>"foo" : "foo"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -47,22 +47,22 @@ var objNumTuple: [{ a: string }, number] = [{ a: "world" }, 5];
 >               : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"world" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
 var strTupleTuple: [string, [number, {}]] = ["bar", [5, { x: 1, y: 1 }]];
 >strTupleTuple : [string, [number, {}]]
 >              : ^^^^^^^^^^^^^^^^^^^^^^
 >["bar", [5, { x: 1, y: 1 }]] : [string, [number, { x: number; y: number; }]]
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 >[5, { x: 1, y: 1 }] : [number, { x: number; y: number; }]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -91,8 +91,8 @@ var unionTuple: [C, string | number] = [new C(), "foo"];
 >        : ^
 >C : typeof C
 >  : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 var unionTuple1: [C, string | number] = [new C(), "foo"];
 >unionTuple1 : [C, string | number]
@@ -103,8 +103,8 @@ var unionTuple1: [C, string | number] = [new C(), "foo"];
 >        : ^
 >C : typeof C
 >  : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 var unionTuple2: [C, string | number, D] = [new C(), "foo", new D()];
 >unionTuple2 : [C, string | number, D]
@@ -115,8 +115,8 @@ var unionTuple2: [C, string | number, D] = [new C(), "foo", new D()];
 >        : ^
 >C : typeof C
 >  : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >new D() : D
 >        : ^
 >D : typeof D
@@ -127,10 +127,10 @@ var unionTuple3: [number, string| number] = [10, "foo"];
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[10, "foo"] : [number, string]
 >            : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>10 : 10
+>   : ^^
+>"foo" : "foo"
+>      : ^^^^^
 
 numStrTuple = numStrTuple2;
 >numStrTuple = numStrTuple2 : [number, string]
@@ -158,8 +158,8 @@ objNumTuple = [ {}, 5];
 >         : ^^^^^^^^^^^^
 >{} : {}
 >   : ^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 numStrBoolTuple = numStrTuple;
 >numStrBoolTuple = numStrTuple : [number, string]
@@ -174,10 +174,10 @@ var strStrTuple: [string, string] = ["foo", "bar", 5];
 >            : ^^^^^^^^^^^^^^^^
 >["foo", "bar", 5] : [string, string, number]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 >5 : 5
 >  : ^
 
@@ -229,10 +229,10 @@ let var1: fixed1 = [0, 0]
 >     : ^^^^^^
 >[0, 0] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 // #52551
 type EmptyTuple = []
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types
index 44075acdf81..d3f6a07dc27 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types
@@ -89,8 +89,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1
     commonPropertyType: "hello",
 >commonPropertyType : string
 >                   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     commonMethodType: a=> a,
 >commonMethodType : (a: string) => string
@@ -125,8 +125,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1
     propertyOnlyInI1: "Hello",
 >propertyOnlyInI1 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 };
 var i1Ori2: I1<number> | I2<number> = { // Like i2
@@ -138,8 +138,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i2
     commonPropertyType: "hello",
 >commonPropertyType : string
 >                   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     commonMethodType: a=> a,
 >commonMethodType : (a: string) => string
@@ -174,8 +174,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i2
     propertyOnlyInI2: "Hello",
 >propertyOnlyInI2 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 };
 var i1Ori2: I1<number> | I2<number> = { // Like i1 and i2 both
@@ -187,8 +187,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1 and i2 both
     commonPropertyType: "hello",
 >commonPropertyType : string
 >                   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     commonMethodType: a=> a,
 >commonMethodType : (a: string) => string
@@ -223,8 +223,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1 and i2 both
     propertyOnlyInI1: "Hello",
 >propertyOnlyInI1 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
     methodOnlyInI2: a => a,
 >methodOnlyInI2 : (a: string) => string
@@ -239,8 +239,8 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1 and i2 both
     propertyOnlyInI2: "Hello",
 >propertyOnlyInI2 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 };
 
@@ -259,8 +259,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         commonPropertyType: "hello",
 >commonPropertyType : string
 >                   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         commonMethodType: a=> a,
 >commonMethodType : (a: string) => string
@@ -295,8 +295,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         propertyOnlyInI1: "Hello",
 >propertyOnlyInI1 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
     },
     { // Like i2
@@ -306,8 +306,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         commonPropertyType: "hello",
 >commonPropertyType : string
 >                   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         commonMethodType: a=> a,
 >commonMethodType : (a: string) => string
@@ -342,8 +342,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         propertyOnlyInI2: "Hello",
 >propertyOnlyInI2 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
     }, { // Like i1 and i2 both
 >{ // Like i1 and i2 both        commonPropertyType: "hello",        commonMethodType: a=> a,        commonMethodWithTypeParameter: a => a,        methodOnlyInI1: a => a,        propertyOnlyInI1: "Hello",        methodOnlyInI2: a => a,        propertyOnlyInI2: "Hello",    } : { commonPropertyType: string; commonMethodType: (a: string) => string; commonMethodWithTypeParameter: (a: number) => number; methodOnlyInI1: (a: string) => string; propertyOnlyInI1: string; methodOnlyInI2: (a: string) => string; propertyOnlyInI2: string; }
@@ -352,8 +352,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         commonPropertyType: "hello",
 >commonPropertyType : string
 >                   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         commonMethodType: a=> a,
 >commonMethodType : (a: string) => string
@@ -388,8 +388,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         propertyOnlyInI1: "Hello",
 >propertyOnlyInI1 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
         methodOnlyInI2: a => a,
 >methodOnlyInI2 : (a: string) => string
@@ -404,8 +404,8 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
         propertyOnlyInI2: "Hello",
 >propertyOnlyInI2 : string
 >                 : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
     }];
 
@@ -494,8 +494,8 @@ var i11Ori21: I11 | I21 = {
     commonPropertyDifferentType: "hello",  
 >commonPropertyDifferentType : string
 >                            : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 };
 var i11Ori21: I11 | I21 = { 
@@ -537,8 +537,8 @@ var i11Ori21: I11 | I21 = {
     commonPropertyDifferentType: 10,
 >commonPropertyDifferentType : number
 >                            : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 };
 var arrayOrI11OrI21: Array<I11 | I21> = [i11, i21, i11 || i21, { 
@@ -592,8 +592,8 @@ var arrayOrI11OrI21: Array<I11 | I21> = [i11, i21, i11 || i21, {
         commonPropertyDifferentType: "hello",
 >commonPropertyDifferentType : string
 >                            : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     }, { 
 >{         // Like i2        commonMethodDifferentReturnType: (a, b) => {            var z = a.charCodeAt(b);            return z;        },        commonPropertyDifferentType: 10,    } : { commonMethodDifferentReturnType: (a: string, b: number) => number; commonPropertyDifferentType: number; }
@@ -632,7 +632,7 @@ var arrayOrI11OrI21: Array<I11 | I21> = [i11, i21, i11 || i21, {
         commonPropertyDifferentType: 10,
 >commonPropertyDifferentType : number
 >                            : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     }];
diff --git a/tests/baselines/reference/contextualTyping.types b/tests/baselines/reference/contextualTyping.types
index eb9b7a55d04..91a02669eec 100644
--- a/tests/baselines/reference/contextualTyping.types
+++ b/tests/baselines/reference/contextualTyping.types
@@ -104,8 +104,8 @@ var c3t2 = <IFoo>({
     n: 1
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 })
 var c3t3: number[] = [];
@@ -416,8 +416,8 @@ c7t2[0] = <IFoo>({n: 1});
 >       : ^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // CONTEXT: Object property assignment
 interface IPlaceHolder {
@@ -631,8 +631,8 @@ objc8.t2 = <IFoo>({
     n: 1
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 objc8.t3 = [];
@@ -978,8 +978,8 @@ var c12t2 = <IFoo> ({
     n: 1
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 var c12t3 = <number[]> [];
@@ -1224,10 +1224,10 @@ var efv = EF1(1,2);
 >         : ^^^^^^
 >EF1 : (a: number, b: number) => number
 >    : ^ ^^      ^^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 
 // contextually typing from ambient class declarations
@@ -1276,10 +1276,10 @@ Point.origin = new Point(0, 0);
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 Point.prototype.add = function(dx, dy) {
 >Point.prototype.add = function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: number, dy: number) => Point
@@ -1344,14 +1344,14 @@ Point.prototype = {
     x: 0,
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     y: 0,
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     add: function(dx, dy) {
 >add : (dx: number, dy: number) => Point
diff --git a/tests/baselines/reference/contextualTyping1.types b/tests/baselines/reference/contextualTyping1.types
index 68b4fb4d75f..b01f60c3abd 100644
--- a/tests/baselines/reference/contextualTyping1.types
+++ b/tests/baselines/reference/contextualTyping1.types
@@ -10,6 +10,6 @@ var foo: {id:number;} = {id:4};
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping10.types b/tests/baselines/reference/contextualTyping10.types
index a1d759b5600..79a30bdeb06 100644
--- a/tests/baselines/reference/contextualTyping10.types
+++ b/tests/baselines/reference/contextualTyping10.types
@@ -14,12 +14,12 @@ class foo { public bar:{id:number;}[] = [{id:1}, {id:2}]; }
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{id:2} : { id: number; }
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping12.types b/tests/baselines/reference/contextualTyping12.types
index 51fd0cd600e..7061b9f760d 100644
--- a/tests/baselines/reference/contextualTyping12.types
+++ b/tests/baselines/reference/contextualTyping12.types
@@ -14,14 +14,14 @@ class foo { public bar:{id:number;}[] = [{id:1}, {id:2, name:"foo"}]; }
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{id:2, name:"foo"} : { id: number; name: string; }
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >name : string
 >     : ^^^^^^
 >"foo" : "foo"
diff --git a/tests/baselines/reference/contextualTyping16.types b/tests/baselines/reference/contextualTyping16.types
index aa1c18bed98..be42d74f04c 100644
--- a/tests/baselines/reference/contextualTyping16.types
+++ b/tests/baselines/reference/contextualTyping16.types
@@ -10,8 +10,8 @@ var foo: {id:number;} = {id:4}; foo = {id:5};
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >foo = {id:5} : { id: number; }
 >             : ^^^^^^^^^^^^^^^
 >foo : { id: number; }
@@ -20,6 +20,6 @@ var foo: {id:number;} = {id:4}; foo = {id:5};
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping17.types b/tests/baselines/reference/contextualTyping17.types
index 35c2a368270..aca3a69c527 100644
--- a/tests/baselines/reference/contextualTyping17.types
+++ b/tests/baselines/reference/contextualTyping17.types
@@ -10,8 +10,8 @@ var foo: {id:number;} = {id:4}; foo = {id: 5, name:"foo"};
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >foo = {id: 5, name:"foo"} : { id: number; name: string; }
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : { id: number; }
@@ -20,8 +20,8 @@ var foo: {id:number;} = {id:4}; foo = {id: 5, name:"foo"};
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >name : string
 >     : ^^^^^^
 >"foo" : "foo"
diff --git a/tests/baselines/reference/contextualTyping18.types b/tests/baselines/reference/contextualTyping18.types
index 5d93eaa0387..00619f3abaf 100644
--- a/tests/baselines/reference/contextualTyping18.types
+++ b/tests/baselines/reference/contextualTyping18.types
@@ -22,6 +22,6 @@ var foo: {id:number;} = <{id:number;}>({ }); foo = {id: 5};
 >        : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping19.types b/tests/baselines/reference/contextualTyping19.types
index e0e47a20e2d..4b97cebe4ea 100644
--- a/tests/baselines/reference/contextualTyping19.types
+++ b/tests/baselines/reference/contextualTyping19.types
@@ -12,8 +12,8 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2}];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >foo = [{id:1}, {id:2}] : { id: number; }[]
 >                       : ^^^^^^^^^^^^^^^^^
 >foo : { id: number; }[]
@@ -24,12 +24,12 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2}];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{id:2} : { id: number; }
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping2.types b/tests/baselines/reference/contextualTyping2.types
index c2e20c034e9..072fd75ddee 100644
--- a/tests/baselines/reference/contextualTyping2.types
+++ b/tests/baselines/reference/contextualTyping2.types
@@ -10,8 +10,8 @@ var foo: {id:number;} = {id:4, name:"foo"};
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >name : string
 >     : ^^^^^^
 >"foo" : "foo"
diff --git a/tests/baselines/reference/contextualTyping20.types b/tests/baselines/reference/contextualTyping20.types
index 33ff3701c84..fffd62c1366 100644
--- a/tests/baselines/reference/contextualTyping20.types
+++ b/tests/baselines/reference/contextualTyping20.types
@@ -12,8 +12,8 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2, name:"foo"}];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >foo = [{id:1}, {id:2, name:"foo"}] : ({ id: number; } | { id: number; name: string; })[]
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : { id: number; }[]
@@ -24,14 +24,14 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2, name:"foo"}];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{id:2, name:"foo"} : { id: number; name: string; }
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >name : string
 >     : ^^^^^^
 >"foo" : "foo"
diff --git a/tests/baselines/reference/contextualTyping21.types b/tests/baselines/reference/contextualTyping21.types
index 4fbeb434379..3520e3d01d2 100644
--- a/tests/baselines/reference/contextualTyping21.types
+++ b/tests/baselines/reference/contextualTyping21.types
@@ -12,8 +12,8 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, 1];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >foo = [{id:1}, 1] : (number | { id: number; })[]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : { id: number; }[]
@@ -24,8 +24,8 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, 1];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >1 : 1
 >  : ^
 
diff --git a/tests/baselines/reference/contextualTyping23.types b/tests/baselines/reference/contextualTyping23.types
index f7487dc0c45..53e0a4fc763 100644
--- a/tests/baselines/reference/contextualTyping23.types
+++ b/tests/baselines/reference/contextualTyping23.types
@@ -16,6 +16,6 @@ var foo:(a:{():number; (i:number):number; })=>number; foo = function(a){return 5
 >                      : ^ ^^^^^^^^      ^^^ ^^      ^^^      ^^^^^^^^^^^^^^
 >a : { (): number; (i: number): number; }
 >  : ^^^^^^      ^^^ ^^      ^^^      ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping24.types b/tests/baselines/reference/contextualTyping24.types
index fd59594c8d8..847fdbc66ce 100644
--- a/tests/baselines/reference/contextualTyping24.types
+++ b/tests/baselines/reference/contextualTyping24.types
@@ -18,6 +18,6 @@ var foo:(a:{():number; (i:number):number; })=>number; foo = function(this: void,
 >     : ^^^^
 >a : string
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping28.types b/tests/baselines/reference/contextualTyping28.types
index b05870f53ae..f821e10162e 100644
--- a/tests/baselines/reference/contextualTyping28.types
+++ b/tests/baselines/reference/contextualTyping28.types
@@ -12,6 +12,6 @@ function foo(param:number[]){}; foo([1]);
 >    : ^     ^^        ^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping29.types b/tests/baselines/reference/contextualTyping29.types
index 1069012e14d..c66cde7e9e9 100644
--- a/tests/baselines/reference/contextualTyping29.types
+++ b/tests/baselines/reference/contextualTyping29.types
@@ -12,8 +12,8 @@ function foo(param:number[]){}; foo([1, 3]);
 >    : ^     ^^        ^^^^^^^^^
 >[1, 3] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping3.types b/tests/baselines/reference/contextualTyping3.types
index 77a20147c29..13ce111cc9d 100644
--- a/tests/baselines/reference/contextualTyping3.types
+++ b/tests/baselines/reference/contextualTyping3.types
@@ -12,6 +12,6 @@ class foo { public bar:{id:number;} = {id:5}; }
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping30.types b/tests/baselines/reference/contextualTyping30.types
index 08421cbe721..7353d44432a 100644
--- a/tests/baselines/reference/contextualTyping30.types
+++ b/tests/baselines/reference/contextualTyping30.types
@@ -12,8 +12,8 @@ function foo(param:number[]){}; foo([1, "a"]);
 >    : ^     ^^        ^^^^^^^^^
 >[1, "a"] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/contextualTyping31.types b/tests/baselines/reference/contextualTyping31.types
index 8b085a220f5..5d450429a4a 100644
--- a/tests/baselines/reference/contextualTyping31.types
+++ b/tests/baselines/reference/contextualTyping31.types
@@ -12,6 +12,6 @@ function foo(param:number[]){}; foo([1]);
 >    : ^     ^^        ^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping34.types b/tests/baselines/reference/contextualTyping34.types
index 116f266f5b6..cb09302a8ef 100644
--- a/tests/baselines/reference/contextualTyping34.types
+++ b/tests/baselines/reference/contextualTyping34.types
@@ -14,6 +14,6 @@ var foo = <{ id: number;}> ({id:4});
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping35.types b/tests/baselines/reference/contextualTyping35.types
index 4fc3d1e581d..41eb5411b5b 100644
--- a/tests/baselines/reference/contextualTyping35.types
+++ b/tests/baselines/reference/contextualTyping35.types
@@ -12,8 +12,8 @@ var foo = <{ id: number;}> {id:4, name: "as"};
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >name : string
 >     : ^^^^^^
 >"as" : "as"
diff --git a/tests/baselines/reference/contextualTyping36.types b/tests/baselines/reference/contextualTyping36.types
index e4913d37545..666a01b52de 100644
--- a/tests/baselines/reference/contextualTyping36.types
+++ b/tests/baselines/reference/contextualTyping36.types
@@ -14,8 +14,8 @@ var foo = <{ id: number; }[]>[{ id: 4 }, <{ id: number; }>({  })];
 >          : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 ><{ id: number; }>({  }) : { id: number; }
 >                        : ^^^^^^      ^^^
 >id : number
diff --git a/tests/baselines/reference/contextualTyping39.types b/tests/baselines/reference/contextualTyping39.types
index 281f3feaa00..81428a34de1 100644
--- a/tests/baselines/reference/contextualTyping39.types
+++ b/tests/baselines/reference/contextualTyping39.types
@@ -8,6 +8,6 @@ var foo = <{ (): number; }> function() { return "err"; };
 >                                               : ^^^^^^      
 >function() { return "err"; } : () => string
 >                             : ^^^^^^^^^^^^
->"err" : string
->      : ^^^^^^
+>"err" : "err"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/contextualTyping4.types b/tests/baselines/reference/contextualTyping4.types
index fd6ab910384..7eaa3e13182 100644
--- a/tests/baselines/reference/contextualTyping4.types
+++ b/tests/baselines/reference/contextualTyping4.types
@@ -12,8 +12,8 @@ class foo { public bar:{id:number;} = {id:5, name:"foo"}; }
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >name : string
 >     : ^^^^^^
 >"foo" : "foo"
diff --git a/tests/baselines/reference/contextualTyping6.types b/tests/baselines/reference/contextualTyping6.types
index 7be0d0c5ea8..0b7da1d519a 100644
--- a/tests/baselines/reference/contextualTyping6.types
+++ b/tests/baselines/reference/contextualTyping6.types
@@ -12,12 +12,12 @@ var foo:{id:number;}[] = [{id:1}, {id:2}];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{id:2} : { id: number; }
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/contextualTyping9.types b/tests/baselines/reference/contextualTyping9.types
index f7b9923917b..4a93c7e9768 100644
--- a/tests/baselines/reference/contextualTyping9.types
+++ b/tests/baselines/reference/contextualTyping9.types
@@ -12,14 +12,14 @@ var foo:{id:number;}[] = [{id:1}, {id:2, name:"foo"}];
 >       : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{id:2, name:"foo"} : { id: number; name: string; }
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >name : string
 >     : ^^^^^^
 >"foo" : "foo"
diff --git a/tests/baselines/reference/contextualTypingArrayDestructuringWithDefaults.types b/tests/baselines/reference/contextualTypingArrayDestructuringWithDefaults.types
index d55f9d8e050..027e8d8b6fa 100644
--- a/tests/baselines/reference/contextualTypingArrayDestructuringWithDefaults.types
+++ b/tests/baselines/reference/contextualTypingArrayDestructuringWithDefaults.types
@@ -32,8 +32,8 @@ let [ x1, c1 = {a: "a"} ]: [number, I?] = [1];
 >    : ^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 let [ c_ = {a: "a"} ]: I[] = [];
 >c_ : I
@@ -63,8 +63,8 @@ function foo() {
 >  : ^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     return length;
 >length : 1
diff --git a/tests/baselines/reference/contextualTypingOfOptionalMembers.types b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
index 122d7e697d7..db3692a5b60 100644
--- a/tests/baselines/reference/contextualTypingOfOptionalMembers.types
+++ b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
@@ -44,8 +44,8 @@ app({
     state: 100,
 >state : number
 >      : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     actions: {
 >actions : { foo: (s: number) => number; }
@@ -147,8 +147,8 @@ app2({
     state: 100,
 >state : number
 >      : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     actions: {
 >actions : { foo: (s: number) => number; }
@@ -206,8 +206,8 @@ app3({
     state: 100,
 >state : number
 >      : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     actions: [
 >actions : ((s: number) => number)[]
@@ -271,8 +271,8 @@ const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number
 >     : ^     ^^       ^^^^^^^^^                      ^^     ^^                                                      ^^^^^           
 >state : number
 >      : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 >foo : (s: number) => number
 >    : ^ ^^^^^^^^^^^^^^^^^^^
 >s => s : (s: number) => number
diff --git a/tests/baselines/reference/contextualTypingReturnStatementWithReturnTypeAnnotation.types b/tests/baselines/reference/contextualTypingReturnStatementWithReturnTypeAnnotation.types
index 1290547349a..67ccb64b9f7 100644
--- a/tests/baselines/reference/contextualTypingReturnStatementWithReturnTypeAnnotation.types
+++ b/tests/baselines/reference/contextualTypingReturnStatementWithReturnTypeAnnotation.types
@@ -49,7 +49,7 @@ function getSpecsFromRaw(
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >isString : (text: unknown) => text is string
 >         : ^    ^^       ^^^^^              
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
index 9a86d5f7b2c..14075af84d1 100644
--- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
+++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
@@ -18,8 +18,8 @@ f10('', () => a => a.foo, ''); // a is ""
 >                              : ^^^^^^
 >f10 : <T>(x: T, b: () => (a: T) => void, y: T) => T
 >    : ^ ^^ ^^ ^^ ^^                    ^^ ^^ ^^^^^ 
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => a => a.foo : () => (a: string) => any
 >                 : ^^^^^^^ ^^^^^^^^^^^^^^^^
 >a => a.foo : (a: string) => any
@@ -32,8 +32,8 @@ f10('', () => a => a.foo, ''); // a is ""
 >  : ^^^^^^
 >foo : any
 >    : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r9 = f10('', () => (a => a.foo), 1); // error
 >r9 : string
diff --git a/tests/baselines/reference/contextuallyTypeArgumentsKeyword.types b/tests/baselines/reference/contextuallyTypeArgumentsKeyword.types
index 834f66ae3a3..95ec3deab65 100644
--- a/tests/baselines/reference/contextuallyTypeArgumentsKeyword.types
+++ b/tests/baselines/reference/contextuallyTypeArgumentsKeyword.types
@@ -21,8 +21,8 @@ const x = {
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >arguments : IArguments
 >          : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/contextuallyTypeAsyncFunctionReturnType.types b/tests/baselines/reference/contextuallyTypeAsyncFunctionReturnType.types
index 5b4e2ae83bf..5d8df0c4172 100644
--- a/tests/baselines/reference/contextuallyTypeAsyncFunctionReturnType.types
+++ b/tests/baselines/reference/contextuallyTypeAsyncFunctionReturnType.types
@@ -188,8 +188,8 @@ test("windows-process-tree", async () => {
 >                                                                                                                                                                                                                                                 : ^^^^
 >test : TestFunction
 >     : ^^^^^^^^^^^^
->"windows-process-tree" : string
->                       : ^^^^^^
+>"windows-process-tree" : "windows-process-tree"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 >async () => {  return new Promise((resolve, reject) => {    getProcessTree(123, (tree) => {      if (tree) {        resolve();      } else {        reject(new Error("windows-process-tree"));      }    });  });} : () => Promise<void>
 >                                                                                                                                                                                                                   : ^^^^^^^^^^^^^^^^^^^
 
@@ -210,8 +210,8 @@ test("windows-process-tree", async () => {
 >                                                                                                                                                : ^^^^
 >getProcessTree : (rootPid: number, callback: (tree: ProcessTreeNode) => void) => void
 >               : ^       ^^      ^^        ^^                               ^^^^^    
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 >(tree) => {      if (tree) {        resolve();      } else {        reject(new Error("windows-process-tree"));      }    } : (tree: ProcessTreeNode) => void
 >                                                                                                                           : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tree : ProcessTreeNode
@@ -237,8 +237,8 @@ test("windows-process-tree", async () => {
 >                                  : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"windows-process-tree" : string
->                       : ^^^^^^
+>"windows-process-tree" : "windows-process-tree"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
       }
     });
   });
diff --git a/tests/baselines/reference/contextuallyTypeGeneratorReturnTypeFromUnion.types b/tests/baselines/reference/contextuallyTypeGeneratorReturnTypeFromUnion.types
index 3243e99c7ea..f9093e1a8dd 100644
--- a/tests/baselines/reference/contextuallyTypeGeneratorReturnTypeFromUnion.types
+++ b/tests/baselines/reference/contextuallyTypeGeneratorReturnTypeFromUnion.types
@@ -18,8 +18,8 @@ const test1: Action = function* () {
 >     : ^^^^^^^^
 >yield '' : string[]
 >         : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     return next[0]
 >next[0] : string
@@ -55,8 +55,8 @@ const test2: Action2 = async function* () {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     return next[0]
 >next[0] : string
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializer.types b/tests/baselines/reference/contextuallyTypedBindingInitializer.types
index 27b1a29b44b..76fe1aaf89f 100644
--- a/tests/baselines/reference/contextuallyTypedBindingInitializer.types
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializer.types
@@ -103,10 +103,10 @@ function g({ prop = ["hello", 1234] }: Tuples) {}
 >     : ^^^^^^^^^^^^^^^^
 >["hello", 1234] : [string, number]
 >                : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1234 : number
->     : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1234 : 1234
+>     : ^^^^
 
 interface StringUnion {
     prop: "foo" | "bar";
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types
index d16504e95f5..9e98e4f927a 100644
--- a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types
@@ -116,10 +116,10 @@ function g({ prop = [101, 1234] }: Tuples) {}
 >     : ^^^^^^^^^^^^^^^^
 >[101, 1234] : [number, number]
 >            : ^^^^^^^^^^^^^^^^
->101 : number
->    : ^^^^^^
->1234 : number
->     : ^^^^^^
+>101 : 101
+>    : ^^^
+>1234 : 1234
+>     : ^^^^
 
 interface StringUnion {
     prop: "foo" | "bar";
diff --git a/tests/baselines/reference/contextuallyTypedBooleanLiterals.types b/tests/baselines/reference/contextuallyTypedBooleanLiterals.types
index b4598cb9780..bf9818ad6bd 100644
--- a/tests/baselines/reference/contextuallyTypedBooleanLiterals.types
+++ b/tests/baselines/reference/contextuallyTypedBooleanLiterals.types
@@ -31,8 +31,8 @@ const bn1 = box(0);  // Box<number>
 >       : ^^^^^^^^^^^
 >box : <T>(value: T) => Box<T>
 >    : ^ ^^     ^^ ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const bn2: Box<number> = box(0);  // Ok
 >bn2 : Box<number>
@@ -41,8 +41,8 @@ const bn2: Box<number> = box(0);  // Ok
 >       : ^^^^^^^^^^^
 >box : <T>(value: T) => Box<T>
 >    : ^ ^^     ^^ ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const bb1 = box(false);  // Box<boolean>
 >bb1 : Box<boolean>
diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
index 6ef695444e1..ec842c364b8 100644
--- a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
+++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
@@ -56,8 +56,8 @@ function invoke(item: ADT) {
 >     : ^^^^^^^^   ^^^^^^^^^ ^^      ^^^      ^^^
 >method : (x: string) => number
 >       : ^ ^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     else {
         item.method(42);
@@ -69,8 +69,8 @@ function invoke(item: ADT) {
 >     : ^^^^^^^^   ^^^^^^^^^ ^^      ^^^      ^^^
 >method : (x: number) => string
 >       : ^ ^^      ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types
index fe4a617e685..716791e38e5 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types
@@ -91,16 +91,16 @@ function getFoo2(): Foo {
 >    : ^
 
             arg.numProp = 10;
->arg.numProp = 10 : number
->                 : ^^^^^^
+>arg.numProp = 10 : 10
+>                 : ^^
 >arg.numProp : number
 >            : ^^^^^^
 >arg : A
 >    : ^
 >numProp : number
 >        : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
         }
         static method2 = (arg) => {
 >method2 : (arg: B) => void
@@ -111,16 +111,16 @@ function getFoo2(): Foo {
 >    : ^
 
             arg.strProp = "hello";
->arg.strProp = "hello" : string
->                      : ^^^^^^
+>arg.strProp = "hello" : "hello"
+>                      : ^^^^^^^
 >arg.strProp : string
 >            : ^^^^^^
 >arg : B
 >    : ^
 >strProp : string
 >        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
 }
@@ -142,16 +142,16 @@ function getFoo3(): Foo {
 >    : ^
 
             arg.numProp = 10;
->arg.numProp = 10 : number
->                 : ^^^^^^
+>arg.numProp = 10 : 10
+>                 : ^^
 >arg.numProp : number
 >            : ^^^^^^
 >arg : A
 >    : ^
 >numProp : number
 >        : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
         }
         static method2 = function (arg) {
 >method2 : (arg: B) => void
@@ -162,16 +162,16 @@ function getFoo3(): Foo {
 >    : ^
 
             arg.strProp = "hello";
->arg.strProp = "hello" : string
->                      : ^^^^^^
+>arg.strProp = "hello" : "hello"
+>                      : ^^^^^^^
 >arg.strProp : string
 >            : ^^^^^^
 >arg : B
 >    : ^
 >strProp : string
 >        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
 }
diff --git a/tests/baselines/reference/contextuallyTypedFunctionExpressionsAndReturnAnnotations.types b/tests/baselines/reference/contextuallyTypedFunctionExpressionsAndReturnAnnotations.types
index 9ff0642a393..6788b5bb041 100644
--- a/tests/baselines/reference/contextuallyTypedFunctionExpressionsAndReturnAnnotations.types
+++ b/tests/baselines/reference/contextuallyTypedFunctionExpressionsAndReturnAnnotations.types
@@ -34,8 +34,8 @@ foo((y): (y2: number) => void => {
 >  : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     return null;
 });
diff --git a/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types b/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types
index 993f5c4c8ff..acb1691c6dc 100644
--- a/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types
+++ b/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types
@@ -42,16 +42,16 @@ function getFoo1(): Foo {
 >    : ^
 
             arg.numProp = 10;
->arg.numProp = 10 : number
->                 : ^^^^^^
+>arg.numProp = 10 : 10
+>                 : ^^
 >arg.numProp : number
 >            : ^^^^^^
 >arg : A
 >    : ^
 >numProp : number
 >        : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         },
         method2(arg) {
@@ -61,16 +61,16 @@ function getFoo1(): Foo {
 >    : ^
 
             arg.strProp = "hello";
->arg.strProp = "hello" : string
->                      : ^^^^^^
+>arg.strProp = "hello" : "hello"
+>                      : ^^^^^^^
 >arg.strProp : string
 >            : ^^^^^^
 >arg : B
 >    : ^
 >strProp : string
 >        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
 }
@@ -92,16 +92,16 @@ function getFoo2(): Foo {
 >    : ^
 
             arg.numProp = 10;
->arg.numProp = 10 : number
->                 : ^^^^^^
+>arg.numProp = 10 : 10
+>                 : ^^
 >arg.numProp : number
 >            : ^^^^^^
 >arg : A
 >    : ^
 >numProp : number
 >        : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         },
         method2: (arg) => {
@@ -113,16 +113,16 @@ function getFoo2(): Foo {
 >    : ^
 
             arg.strProp = "hello";
->arg.strProp = "hello" : string
->                      : ^^^^^^
+>arg.strProp = "hello" : "hello"
+>                      : ^^^^^^^
 >arg.strProp : string
 >            : ^^^^^^
 >arg : B
 >    : ^
 >strProp : string
 >        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
 }
@@ -144,16 +144,16 @@ function getFoo3(): Foo {
 >    : ^
 
             arg.numProp = 10;
->arg.numProp = 10 : number
->                 : ^^^^^^
+>arg.numProp = 10 : 10
+>                 : ^^
 >arg.numProp : number
 >            : ^^^^^^
 >arg : A
 >    : ^
 >numProp : number
 >        : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         },
         method2: function (arg) {
@@ -165,16 +165,16 @@ function getFoo3(): Foo {
 >    : ^
 
             arg.strProp = "hello";
->arg.strProp = "hello" : string
->                      : ^^^^^^
+>arg.strProp = "hello" : "hello"
+>                      : ^^^^^^^
 >arg.strProp : string
 >            : ^^^^^^
 >arg : B
 >    : ^
 >strProp : string
 >        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
 }
diff --git a/tests/baselines/reference/contextuallyTypedParametersOptionalInJSDoc.types b/tests/baselines/reference/contextuallyTypedParametersOptionalInJSDoc.types
index 860a2f11650..8160cf486a3 100644
--- a/tests/baselines/reference/contextuallyTypedParametersOptionalInJSDoc.types
+++ b/tests/baselines/reference/contextuallyTypedParametersOptionalInJSDoc.types
@@ -46,16 +46,16 @@ const fn1 =
 >         : ^^^^
 >self : (a: string, b?: number | undefined) => void
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     self("", undefined);
 >self("", undefined) : void
 >                    : ^^^^
 >self : (a: string, b?: number | undefined) => void
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -92,16 +92,16 @@ const fn2 =
 >         : ^^^^
 >self : (a: string, b?: number | undefined) => void
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     self("", undefined);
 >self("", undefined) : void
 >                    : ^^^^
 >self : (a: string, b?: number | undefined) => void
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types
index 5e21668734b..2aac7cab5e6 100644
--- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types
+++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types
@@ -66,8 +66,8 @@ const f11 = id1(function ({ foo = 42 }) { return foo });
 >                                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >foo : number
 >    : ^^^^^^
 
@@ -114,8 +114,8 @@ const f14 = id4(function ({ foo = 42 }) { return foo });
 >                                       : ^       ^^^^^^^^^^      ^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >foo : number
 >    : ^^^^^^
 
@@ -142,8 +142,8 @@ const f21 = id1(function (foo = 42) { return foo });
 >                                   : ^   ^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >foo : number
 >    : ^^^^^^
 
@@ -174,8 +174,8 @@ const f25 = id5(function (foo = 42) { return foo });
 >                                   : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >foo : number
 >    : ^^^^^^
 
@@ -320,8 +320,8 @@ g1((x = 1) => 0);  // number
 >             : ^ ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 
@@ -334,8 +334,8 @@ g2((x = 1) => 0);  // number
 >             : ^ ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 
@@ -348,8 +348,8 @@ g3((x = 1) => 0);  // number
 >             : ^ ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 
@@ -362,8 +362,8 @@ g4((x = 1) => 0);  // number
 >             : ^ ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 
@@ -378,8 +378,8 @@ g5((x = 1) => 0);  // any
 >  : ^^^
 >1 : 1
 >  : ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 g6((x = 1) => 0);  // number
 >g6((x = 1) => 0) : (x?: number) => number
@@ -390,10 +390,10 @@ g6((x = 1) => 0);  // number
 >             : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>0 : 0
+>  : ^
 
 g6((x?) => 0);     // Implicit any error
 >g6((x?) => 0) : (x?: any) => number
@@ -404,8 +404,8 @@ g6((x?) => 0);     // Implicit any error
 >          : ^ ^^^^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 g6((...x) => 0);   // []
 >g6((...x) => 0) : () => number
@@ -416,8 +416,8 @@ g6((...x) => 0);   // []
 >            : ^^^^^^^^^^^^
 >x : []
 >  : ^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // Repro from #28816
 
@@ -465,8 +465,8 @@ const newGetFoo2 = id(function getFoo ({ foo = 42 }) {
 >       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
   return foo;
 >foo : number
@@ -551,8 +551,8 @@ const memoizedAdd3 = memoize((x: number, y = 0): number => x + y);
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >x + y : number
 >      : ^^^^^^
 >x : number
@@ -591,16 +591,16 @@ export function executeSomething() {
 >      : ^^^^^^^
 
             root.innerHTML = '';
->root.innerHTML = '' : string
->                    : ^^^^^^
+>root.innerHTML = '' : ""
+>                    : ^^
 >root.innerHTML : string
 >               : ^^^^^^
 >root : HTMLElement
 >     : ^^^^^^^^^^^
 >innerHTML : string
 >          : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
         }
     });
 }
diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types
index 077f1399301..5e445caa8ad 100644
--- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types
+++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types
@@ -30,8 +30,8 @@ test1(
     count: 0,
 >count : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   },
   {
@@ -47,8 +47,8 @@ test1(
 >    : ^^^^^^^^^^^^^^^^^^
 >max : number
 >    : ^^^^^^
->500 : number
->    : ^^^^^^
+>500 : 500
+>    : ^^^
 
     hasAccess: (ctx, user: { name: string }) => {},
 >hasAccess : (ctx: { count: number; }, user: { name: string; }) => void
@@ -90,6 +90,6 @@ const test3: (arg: number) => void = (arg = 1) => {};
 >                : ^   ^^^^^^^^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types
index a13ca044e74..4dfd369a9c0 100644
--- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types
+++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types
@@ -30,8 +30,8 @@ test(
     count: 0,
 >count : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   },
   {
@@ -47,8 +47,8 @@ test(
 >    : ^^^^^^^^^^^^^^^^^^
 >max : number
 >    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
   },
 );
diff --git a/tests/baselines/reference/contextuallyTypedParametersWithQuestionToken.types b/tests/baselines/reference/contextuallyTypedParametersWithQuestionToken.types
index d4f43bd460f..4af45965a2c 100644
--- a/tests/baselines/reference/contextuallyTypedParametersWithQuestionToken.types
+++ b/tests/baselines/reference/contextuallyTypedParametersWithQuestionToken.types
@@ -38,16 +38,16 @@ const f1: (a: string, b: number) => void = function self(a, b?) {
 >         : ^^^^
 >self : (a: string, b?: number | undefined) => void
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   self("", undefined);
 >self("", undefined) : void
 >                    : ^^^^
 >self : (a: string, b?: number | undefined) => void
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -82,16 +82,16 @@ const f2: (a: string, b: number) => void = function self(a, b?: number) {
 >         : ^^^^
 >self : (a: string, b?: number) => void
 >     : ^ ^^^^^^^^^^ ^^^      ^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   self("", undefined);
 >self("", undefined) : void
 >                    : ^^^^
 >self : (a: string, b?: number) => void
 >     : ^ ^^^^^^^^^^ ^^^      ^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.types b/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.types
index 15e4dc0e593..95e4eb7641d 100644
--- a/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.types
+++ b/tests/baselines/reference/contextuallyTypedSymbolNamedProperties.types
@@ -10,8 +10,8 @@ const A = Symbol("A");
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"A" : string
->    : ^^^^^^
+>"A" : "A"
+>    : ^^^
 
 const B = Symbol("B");
 >B : unique symbol
@@ -20,8 +20,8 @@ const B = Symbol("B");
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"B" : string
->    : ^^^^^^
+>"B" : "B"
+>    : ^^^
 
 type Action =
 >Action : Action
diff --git a/tests/baselines/reference/contextuallyTypingOrOperator.types b/tests/baselines/reference/contextuallyTypingOrOperator.types
index 2dff6162434..db43f05ee5b 100644
--- a/tests/baselines/reference/contextuallyTypingOrOperator.types
+++ b/tests/baselines/reference/contextuallyTypingOrOperator.types
@@ -32,8 +32,8 @@ var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 };
 >       : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var v2 = (s: string) => s.length || function (s) { s.length };
 >v2 : (s: string) => number | ((s: any) => void)
diff --git a/tests/baselines/reference/contextuallyTypingOrOperator2.types b/tests/baselines/reference/contextuallyTypingOrOperator2.types
index 9cba778c1d2..ba5cbcd9755 100644
--- a/tests/baselines/reference/contextuallyTypingOrOperator2.types
+++ b/tests/baselines/reference/contextuallyTypingOrOperator2.types
@@ -32,8 +32,8 @@ var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 };
 >       : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var v2 = (s: string) => s.length || function (s) { s.aaa };
 >v2 : (s: string) => number | ((s: any) => void)
diff --git a/tests/baselines/reference/contravariantInferenceAndTypeGuard.types b/tests/baselines/reference/contravariantInferenceAndTypeGuard.types
index ccea82f902c..f4d1809ed73 100644
--- a/tests/baselines/reference/contravariantInferenceAndTypeGuard.types
+++ b/tests/baselines/reference/contravariantInferenceAndTypeGuard.types
@@ -136,8 +136,8 @@ const filter1 = list2.filter(function(item, node, list): item is Test {
 >         : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'c' : string
->    : ^^^^^^
+>'c' : "c"
+>    : ^^^
 
 const x: List<Test> = filter1; // $ExpectType List<Test>
 >x : List<Test>
diff --git a/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunction.types b/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunction.types
index 21290002071..fd7dc6f5bfc 100644
--- a/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunction.types
+++ b/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunction.types
@@ -56,8 +56,8 @@ const result = foo({
     thing: 'asd',
 >thing : string
 >      : ^^^^^^
->'asd' : string
->      : ^^^^^^
+>'asd' : "asd"
+>      : ^^^^^
 
   },
 });
diff --git a/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunctionJs.types b/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunctionJs.types
index 2b0cb21db13..e12eb8bad98 100644
--- a/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunctionJs.types
+++ b/tests/baselines/reference/contravariantOnlyInferenceFromAnnotatedFunctionJs.types
@@ -53,8 +53,8 @@ const result = foo({
     thing: "asd",
 >thing : string
 >      : ^^^^^^
->"asd" : string
->      : ^^^^^^
+>"asd" : "asd"
+>      : ^^^^^
 
   },
 });
diff --git a/tests/baselines/reference/controlFlowAliasing.types b/tests/baselines/reference/controlFlowAliasing.types
index b51b9390073..d24919344d5 100644
--- a/tests/baselines/reference/controlFlowAliasing.types
+++ b/tests/baselines/reference/controlFlowAliasing.types
@@ -205,8 +205,8 @@ function f14(x: number | null | undefined): number | null {
 >             : ^^^^^^^
 >x : number | null
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function f15(obj: { readonly x: string | number }) {
@@ -282,8 +282,8 @@ function f16(obj: { readonly x: string | number }) {
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     if (isString) {
 >isString : boolean
@@ -368,8 +368,8 @@ function f18(obj: readonly [string | number]) {
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42] : [number]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     if (isString) {
 >isString : boolean
@@ -1257,24 +1257,24 @@ class C11 {
         }
         else {
             this.x = 10;
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : string | number
 >       : ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
             x = 10;
->x = 10 : number
->       : ^^^^^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
         }
     }
 }
diff --git a/tests/baselines/reference/controlFlowAliasingCatchVariables(useunknownincatchvariables=true).types b/tests/baselines/reference/controlFlowAliasingCatchVariables(useunknownincatchvariables=true).types
index f2867d3cdfc..04c7b8693bf 100644
--- a/tests/baselines/reference/controlFlowAliasingCatchVariables(useunknownincatchvariables=true).types
+++ b/tests/baselines/reference/controlFlowAliasingCatchVariables(useunknownincatchvariables=true).types
@@ -73,12 +73,12 @@ catch (e) {
 >         : ^^^^^^^^
 
     e = 1;
->e = 1 : number
->      : ^^^^^^
+>e = 1 : 1
+>      : ^
 >e : unknown
 >  : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     if (isString) {
 >isString : boolean
diff --git a/tests/baselines/reference/controlFlowArrayErrors.types b/tests/baselines/reference/controlFlowArrayErrors.types
index a6c2e274547..67db9264a78 100644
--- a/tests/baselines/reference/controlFlowArrayErrors.types
+++ b/tests/baselines/reference/controlFlowArrayErrors.types
@@ -243,8 +243,8 @@ function f6() {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >push : ((...items: (string | number)[]) => number) | ((...items: boolean[]) => number)
 >     : ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^     ^^^^^^^^^^^^^^^^      ^
->99 : number
->   : ^^^^^^
+>99 : 99
+>   : ^^
 }
 
 function f7() {
@@ -296,8 +296,8 @@ function f7() {
 >  : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 function f8() {
diff --git a/tests/baselines/reference/controlFlowBindingElement.types b/tests/baselines/reference/controlFlowBindingElement.types
index dd5421c3334..f984a1a37c8 100644
--- a/tests/baselines/reference/controlFlowBindingElement.types
+++ b/tests/baselines/reference/controlFlowBindingElement.types
@@ -26,8 +26,8 @@
 >                                  : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'param is not defined' : string
->                       : ^^^^^^
+>'param is not defined' : "param is not defined"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
     } = data;
 >data : { param: string; }
@@ -61,8 +61,8 @@
     let foo: string | undefined = "";
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     const {
         param = (() => { throw new Error('param is not defined') })(),
@@ -78,8 +78,8 @@
 >                                  : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'param is not defined' : string
->                       : ^^^^^^
+>'param is not defined' : "param is not defined"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
     } = data;
 >data : { param: string; }
@@ -104,8 +104,8 @@
     let foo: string | undefined = "";
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     const {
         param = (() => { foo = undefined })(),
@@ -147,8 +147,8 @@
     let foo: string | undefined = "";
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     const {
         param = (() => { return "" + 1 })(),
@@ -214,12 +214,12 @@
 >                                               : ^^^^^^^^^^^^^^
 >() => { foo = ""; return 'window' as const } : () => "window"
 >                                             : ^^^^^^^^^^^^^^
->foo = "" : string
->         : ^^^^^^
+>foo = "" : ""
+>         : ^^
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >'window' as const : "window"
 >                  : ^^^^^^^^
 >'window' : "window"
@@ -296,12 +296,12 @@
 >                                               : ^^^^^^^^^^^^^^
 >() => { foo = ""; return 'window' as const } : () => "window"
 >                                             : ^^^^^^^^^^^^^^
->foo = "" : string
->         : ^^^^^^
+>foo = "" : ""
+>         : ^^
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >'window' as const : "window"
 >                  : ^^^^^^^^
 >'window' : "window"
@@ -378,12 +378,12 @@
 >                                     : ^^^^^^^^^^^^
 >() => { foo = ""; return window; } : () => Window
 >                                   : ^^^^^^^^^^^^
->foo = "" : string
->         : ^^^^^^
+>foo = "" : ""
+>         : ^^
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >window : Window
 >       : ^^^^^^
 >window : Window
diff --git a/tests/baselines/reference/controlFlowCaching.types b/tests/baselines/reference/controlFlowCaching.types
index eac4d5a024d..225b55887de 100644
--- a/tests/baselines/reference/controlFlowCaching.types
+++ b/tests/baselines/reference/controlFlowCaching.types
@@ -600,8 +600,8 @@ function f(dim, offsets, arr, acommon, centerAnchorLimit, g, has, lin) {
 >            : ^^^
 >length : any
 >       : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         taMinorTick.length > 0 ? taMinorTick.length : 0) +
 >taMinorTick.length > 0 ? taMinorTick.length : 0 : any
@@ -619,8 +619,8 @@ function f(dim, offsets, arr, acommon, centerAnchorLimit, g, has, lin) {
 >            : ^^^
 >length : any
 >       : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         tsize + taTitleGap;
 >tsize : any
@@ -813,12 +813,12 @@ function f(dim, offsets, arr, acommon, centerAnchorLimit, g, has, lin) {
     }
 
     titleRotation = (taTitleOrientation && taTitleOrientation == "away") ? 180 : 0;
->titleRotation = (taTitleOrientation && taTitleOrientation == "away") ? 180 : 0 : number
->                                                                               : ^^^^^^
+>titleRotation = (taTitleOrientation && taTitleOrientation == "away") ? 180 : 0 : 0 | 180
+>                                                                               : ^^^^^^^
 >titleRotation : number
 >              : ^^^^^^
->(taTitleOrientation && taTitleOrientation == "away") ? 180 : 0 : number
->                                                               : ^^^^^^
+>(taTitleOrientation && taTitleOrientation == "away") ? 180 : 0 : 0 | 180
+>                                                               : ^^^^^^^
 >(taTitleOrientation && taTitleOrientation == "away") : any
 >taTitleOrientation && taTitleOrientation == "away" : any
 >taTitleOrientation : any
@@ -827,10 +827,10 @@ function f(dim, offsets, arr, acommon, centerAnchorLimit, g, has, lin) {
 >taTitleOrientation : any
 >"away" : "away"
 >       : ^^^^^^
->180 : number
->    : ^^^^^^
->0 : number
->  : ^^^^^^
+>180 : 180
+>    : ^^^
+>0 : 0
+>  : ^
 
     titlePos.y = offsets.t - titleOffset + (titleRotation ? 0 : tsize);
 >titlePos.y = offsets.t - titleOffset + (titleRotation ? 0 : tsize) : any
diff --git a/tests/baselines/reference/controlFlowDeleteOperator.types b/tests/baselines/reference/controlFlowDeleteOperator.types
index 795ad91908f..6991d009ae5 100644
--- a/tests/baselines/reference/controlFlowDeleteOperator.types
+++ b/tests/baselines/reference/controlFlowDeleteOperator.types
@@ -16,8 +16,8 @@ function f() {
 >         : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x.a;
 >x.a : string | number | undefined
@@ -36,28 +36,28 @@ function f() {
 >  : ^^^^^^^^^^^^^^^
 
     x.a = 1;
->x.a = 1 : number
->        : ^^^^^^
+>x.a = 1 : 1
+>        : ^
 >x.a : string | number | undefined
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { a?: number | string; b: number | string; }
 >  : ^^^^^^               ^^^^^               ^^^
 >a : string | number | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x.b = 1;
->x.b = 1 : number
->        : ^^^^^^
+>x.b = 1 : 1
+>        : ^
 >x.b : string | number
 >    : ^^^^^^^^^^^^^^^
 >x : { a?: number | string; b: number | string; }
 >  : ^^^^^^               ^^^^^               ^^^
 >b : string | number
 >  : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x.a;
 >x.a : number
diff --git a/tests/baselines/reference/controlFlowDestructuringDeclaration.types b/tests/baselines/reference/controlFlowDestructuringDeclaration.types
index ea6661dc088..77a7e278d55 100644
--- a/tests/baselines/reference/controlFlowDestructuringDeclaration.types
+++ b/tests/baselines/reference/controlFlowDestructuringDeclaration.types
@@ -8,8 +8,8 @@ function f1() {
     let x: string | number = 1;
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x;
 >x : number
@@ -18,8 +18,8 @@ function f1() {
     let y: string | undefined = "";
 >y : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     y;
 >y : string
@@ -35,8 +35,8 @@ function f2() {
 >  : ^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x;
 >x : number
@@ -47,8 +47,8 @@ function f2() {
 >  : ^^^^^^^^^^^^^^^^^^
 >[""] : [string]
 >     : ^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     y;
 >y : string
@@ -57,8 +57,8 @@ function f2() {
     let [z = ""]: [string | undefined] = [undefined];
 >z : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >[undefined] : [undefined]
 >            : ^^^^^^^^^^^
 >undefined : undefined
@@ -78,8 +78,8 @@ function f3() {
 >  : ^^^^^^^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x;
 >x : number
@@ -90,8 +90,8 @@ function f3() {
 >  : ^^^^^^^^^^^^^^^^^^
 >[""] : string[]
 >     : ^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     y;
 >y : string
@@ -100,8 +100,8 @@ function f3() {
     let [z = ""]: (string | undefined)[] = [undefined];
 >z : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >[undefined] : undefined[]
 >            : ^^^^^^^^^^^
 >undefined : undefined
@@ -125,8 +125,8 @@ function f4() {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x;
 >x : number
@@ -141,8 +141,8 @@ function f4() {
 >          : ^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     y;
 >y : string
@@ -151,8 +151,8 @@ function f4() {
     let { z = "" }: { z: string | undefined } = { z: undefined };
 >z : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >z : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
 >{ z: undefined } : { z: undefined; }
@@ -180,8 +180,8 @@ function f5() {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x;
 >x : number
@@ -196,8 +196,8 @@ function f5() {
 >          : ^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     y;
 >y : string
@@ -206,8 +206,8 @@ function f5() {
     let { z = "" }: { z?: string | undefined } = { z: undefined };
 >z : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >z : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
 >{ z: undefined } : { z: undefined; }
@@ -253,8 +253,8 @@ function f6() {
     let { z = "" }: { z?: string | undefined } = {};
 >z : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >z : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
 >{} : {}
@@ -278,8 +278,8 @@ function f7() {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let { x }: { [x: string]: string | number } = o;
 >x : string | number
diff --git a/tests/baselines/reference/controlFlowDestructuringLoop.types b/tests/baselines/reference/controlFlowDestructuringLoop.types
index 2c0e7a849d6..026ac5b4eda 100644
--- a/tests/baselines/reference/controlFlowDestructuringLoop.types
+++ b/tests/baselines/reference/controlFlowDestructuringLoop.types
@@ -71,8 +71,8 @@ function foo(things: Val[]): void {
 >    : ^^^^^^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
         }
         else {
             const { val } = thing;
diff --git a/tests/baselines/reference/controlFlowDoWhileStatement.types b/tests/baselines/reference/controlFlowDoWhileStatement.types
index f258da9f28a..baa781f6bba 100644
--- a/tests/baselines/reference/controlFlowDoWhileStatement.types
+++ b/tests/baselines/reference/controlFlowDoWhileStatement.types
@@ -14,12 +14,12 @@ function a() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     do {
         x; // string
@@ -39,12 +39,12 @@ function b() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     do {
         x; // string
@@ -52,12 +52,12 @@ function b() {
 >  : ^^^^^^
 
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         break;
     } while (cond)
@@ -73,12 +73,12 @@ function c() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     do {
         x; // string
@@ -117,12 +117,12 @@ function d() {
 >  : ^^^^^^^^^^^^^^^
 
     x = 1000;
->x = 1000 : number
->         : ^^^^^^
+>x = 1000 : 1000
+>         : ^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
 
     do {
         x; // number
@@ -130,12 +130,12 @@ function d() {
 >  : ^^^^^^
 
         x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     } while (x = x.length)
 >x = x.length : number
@@ -162,21 +162,21 @@ function e() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     do {
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     } while (cond)
 >cond : boolean
diff --git a/tests/baselines/reference/controlFlowElementAccess.types b/tests/baselines/reference/controlFlowElementAccess.types
index 98590f3ff39..2dc3216c8df 100644
--- a/tests/baselines/reference/controlFlowElementAccess.types
+++ b/tests/baselines/reference/controlFlowElementAccess.types
@@ -43,10 +43,10 @@ const y: [number, number] = [0, 0];
 >  : ^^^^^^^^^^^^^^^^
 >[0, 0] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 if (y[0] === 0) {
 >y[0] === 0 : boolean
diff --git a/tests/baselines/reference/controlFlowElementAccess2.types b/tests/baselines/reference/controlFlowElementAccess2.types
index 2a50ff44ace..aeea74a24f4 100644
--- a/tests/baselines/reference/controlFlowElementAccess2.types
+++ b/tests/baselines/reference/controlFlowElementAccess2.types
@@ -28,7 +28,7 @@ if (typeof config['works'] !== 'boolean') {
 >          : ^^^^^^^^^
 
     config.works.prop = 'test'; // ok
->config.works.prop = 'test' : string
+>config.works.prop = 'test' : "test"
 >                           : ^^^^^^
 >config.works.prop : string
 >                  : ^^^^^^
@@ -40,11 +40,11 @@ if (typeof config['works'] !== 'boolean') {
 >      : ^^^^^^^^      ^^^
 >prop : string
 >     : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
     config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
->config['works'].prop = 'test' : string
+>config['works'].prop = 'test' : "test"
 >                              : ^^^^^^
 >config['works'].prop : string
 >                     : ^^^^^^
@@ -56,7 +56,7 @@ if (typeof config['works'] !== 'boolean') {
 >        : ^^^^^^^
 >prop : string
 >     : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 }
 if (typeof config.works !== 'boolean') {
@@ -74,7 +74,7 @@ if (typeof config.works !== 'boolean') {
 >          : ^^^^^^^^^
 
     config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
->config['works'].prop = 'test' : string
+>config['works'].prop = 'test' : "test"
 >                              : ^^^^^^
 >config['works'].prop : string
 >                     : ^^^^^^
@@ -86,11 +86,11 @@ if (typeof config.works !== 'boolean') {
 >        : ^^^^^^^
 >prop : string
 >     : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
     config.works.prop = 'test'; // ok
->config.works.prop = 'test' : string
+>config.works.prop = 'test' : "test"
 >                           : ^^^^^^
 >config.works.prop : string
 >                  : ^^^^^^
@@ -102,7 +102,7 @@ if (typeof config.works !== 'boolean') {
 >      : ^^^^^^^^      ^^^
 >prop : string
 >     : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 }
 
diff --git a/tests/baselines/reference/controlFlowFinallyNoCatchAssignments.types b/tests/baselines/reference/controlFlowFinallyNoCatchAssignments.types
index 9ed59e12a81..5ca27e6ae18 100644
--- a/tests/baselines/reference/controlFlowFinallyNoCatchAssignments.types
+++ b/tests/baselines/reference/controlFlowFinallyNoCatchAssignments.types
@@ -29,21 +29,21 @@ try {
 >  : ^^^^^^
 
         a = 1;
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     } else {
         a = 2;
->a = 2 : number
->      : ^^^^^^
+>a = 2 : 2
+>      : ^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 } finally {
     console.log(x);
diff --git a/tests/baselines/reference/controlFlowForInStatement2.types b/tests/baselines/reference/controlFlowForInStatement2.types
index 4b7eea63780..57cf74706aa 100644
--- a/tests/baselines/reference/controlFlowForInStatement2.types
+++ b/tests/baselines/reference/controlFlowForInStatement2.types
@@ -62,8 +62,8 @@ if (keywordA in c) {
 let stringB: string = 'b';
 >stringB : string
 >        : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
 if ((stringB as 'b') in c) {
 >(stringB as 'b') in c : boolean
diff --git a/tests/baselines/reference/controlFlowForIndexSignatures.types b/tests/baselines/reference/controlFlowForIndexSignatures.types
index 4c011036399..e3e9cb0463f 100644
--- a/tests/baselines/reference/controlFlowForIndexSignatures.types
+++ b/tests/baselines/reference/controlFlowForIndexSignatures.types
@@ -14,8 +14,8 @@ const boo: Foo = { bar: 'bar' };
 >               : ^^^^^^^^^^^^^^^^
 >bar : string
 >    : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 function a(aboo1?: Foo) {
 >a : (aboo1?: Foo) => void
@@ -117,8 +117,8 @@ if (typeof c === 'string') {
 >                 : ^^^^^^^^^^^^^^^^
 >bar : string
 >    : ^^^^^^
->'works' : string
->        : ^^^^^^
+>'works' : "works"
+>        : ^^^^^^^
 
     const boo2: C = { bar: 1 }; // should error
 >boo2 : { [key: string]: string; }
@@ -127,7 +127,7 @@ if (typeof c === 'string') {
 >           : ^^^^^^^^^^^^^^^^
 >bar : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
diff --git a/tests/baselines/reference/controlFlowGenericTypes.types b/tests/baselines/reference/controlFlowGenericTypes.types
index 4ce96fffc78..34aaf807091 100644
--- a/tests/baselines/reference/controlFlowGenericTypes.types
+++ b/tests/baselines/reference/controlFlowGenericTypes.types
@@ -90,8 +90,8 @@ function f1<T extends string | undefined>(x: T, y: { a: T }, z: [T]): string {
 >  : ^
     }
     return "hello";
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 function f2<T>(x: Extract<T, string | undefined> | null): string {
@@ -121,8 +121,8 @@ function f2<T>(x: Extract<T, string | undefined> | null): string {
 >  : ^^^^^^
     }
     return "hello";
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 interface Box<T> {
@@ -525,8 +525,8 @@ function get<K extends keyof A>(key: K, obj: A): number {
 >      : ^^^^^^
     }
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 };
 
@@ -561,8 +561,8 @@ function once<ET, T extends EventEmitter<ET>>(emittingObject: T, eventName: keyo
 >    : ^ ^^^^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >eventName : keyof ET
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     emittingObject.off(eventName as typeof eventName, 0);
 >emittingObject.off(eventName as typeof eventName, 0) : void
@@ -579,8 +579,8 @@ function once<ET, T extends EventEmitter<ET>>(emittingObject: T, eventName: keyo
 >          : ^^^^^^^^
 >eventName : keyof ET
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 // In an element access obj[x], we consider obj to be in a constraint position, except when obj is of
diff --git a/tests/baselines/reference/controlFlowIIFE.types b/tests/baselines/reference/controlFlowIIFE.types
index 3b577c97697..9ba8fede405 100644
--- a/tests/baselines/reference/controlFlowIIFE.types
+++ b/tests/baselines/reference/controlFlowIIFE.types
@@ -142,12 +142,12 @@ function f3() {
 >  : ^^^^^^
 >z : number
 >  : ^^^^^^
->y = 1 : number
->      : ^^^^^^
+>y = 1 : 1
+>      : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -166,12 +166,12 @@ let maybeNumber: number | undefined;
 >                                   : ^^^^^^^^^^
 
     maybeNumber = 1;
->maybeNumber = 1 : number
->                : ^^^^^^
+>maybeNumber = 1 : 1
+>                : ^
 >maybeNumber : number | undefined
 >            : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 })();
 maybeNumber++;
@@ -210,8 +210,8 @@ if (!test) {
 >                                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Test is not defined' : string
->                      : ^^^^^^
+>'Test is not defined' : "Test is not defined"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 }
 (() => {
 >(() => {    test.slice(1); // No error})() : void
@@ -230,8 +230,8 @@ if (!test) {
 >     : ^^^^^^
 >slice : (start?: number, end?: number) => string
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 })();
 
@@ -254,12 +254,12 @@ function f4() {
 >                                : ^^^^^^^^^^
 
         v = 1;
->v = 1 : number
->      : ^^^^^^
+>v = 1 : 1
+>      : ^
 >v : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     })();
     v;
@@ -290,12 +290,12 @@ function f5() {
 >  : ^
 
         v = 1;
->v = 1 : number
->      : ^^^^^^
+>v = 1 : 1
+>      : ^
 >v : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     })();
     v; // still undefined
diff --git a/tests/baselines/reference/controlFlowIfStatement.types b/tests/baselines/reference/controlFlowIfStatement.types
index dc090ba14c2..823f3de5f67 100644
--- a/tests/baselines/reference/controlFlowIfStatement.types
+++ b/tests/baselines/reference/controlFlowIfStatement.types
@@ -73,21 +73,21 @@ function a() {
 >     : ^^^^^^^
 
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
     else {
         x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         return;
     }
@@ -108,12 +108,12 @@ function b() {
 >     : ^^^^^^^
 
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         throw "";
 >"" : ""
@@ -121,12 +121,12 @@ function b() {
     }
     else {
         x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     x; // string
 >x : string
@@ -186,8 +186,8 @@ function d<T extends string>(data: string | T): never {
 >                                : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'will always happen' : string
->                     : ^^^^^^
+>'will always happen' : "will always happen"
+>                     : ^^^^^^^^^^^^^^^^^^^^
     }
     else {
         return data;
diff --git a/tests/baselines/reference/controlFlowInOperator.types b/tests/baselines/reference/controlFlowInOperator.types
index 8c6de05952e..fb9c7f67b40 100644
--- a/tests/baselines/reference/controlFlowInOperator.types
+++ b/tests/baselines/reference/controlFlowInOperator.types
@@ -133,12 +133,12 @@ function uniqueID_54790(
 >          : ^^^^^^^^^
 
     id = "1";
->id = "1" : string
->         : ^^^^^^
+>id = "1" : "1"
+>         : ^^^
 >id : string
 >   : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
   }
   if (!(id in seenIDs)) {
 >!(id in seenIDs) : boolean
@@ -208,8 +208,8 @@ function uniqueID_54790(
 >                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"heat death of the universe" : string
->                             : ^^^^^^
+>"heat death of the universe" : "heat death of the universe"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
 function uniqueID_54790_2(id: string | number, seenIDs: object) {
@@ -221,12 +221,12 @@ function uniqueID_54790_2(id: string | number, seenIDs: object) {
 >        : ^^^^^^
 
   id = "a";
->id = "a" : string
->         : ^^^^^^
+>id = "a" : "a"
+>         : ^^^
 >id : string | number
 >   : ^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
   for (let i = 1; i < 3; i++) {
 >i : number
@@ -272,12 +272,12 @@ function uniqueID_54790_3(id: string | number, seenIDs: object) {
 >        : ^^^^^^
 
   id = "a";
->id = "a" : string
->         : ^^^^^^
+>id = "a" : "a"
+>         : ^^^
 >id : string | number
 >   : ^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
   for (let i = 1; i < 3; i++) {
 >i : number
diff --git a/tests/baselines/reference/controlFlowInitializedDestructuringVariables.types b/tests/baselines/reference/controlFlowInitializedDestructuringVariables.types
index 6d4ced9734f..599a64b0e55 100644
--- a/tests/baselines/reference/controlFlowInitializedDestructuringVariables.types
+++ b/tests/baselines/reference/controlFlowInitializedDestructuringVariables.types
@@ -13,8 +13,8 @@ const {
     a = "0",
 >a : string
 >  : ^^^^^^
->"0" : string
->    : ^^^^^^
+>"0" : "0"
+>    : ^^^
 
     b = +a,
 >b : number
diff --git a/tests/baselines/reference/controlFlowInstanceOfGuardPrimitives.types b/tests/baselines/reference/controlFlowInstanceOfGuardPrimitives.types
index 8ea034e4623..b5fe3b2bea0 100644
--- a/tests/baselines/reference/controlFlowInstanceOfGuardPrimitives.types
+++ b/tests/baselines/reference/controlFlowInstanceOfGuardPrimitives.types
@@ -89,8 +89,8 @@ function distinguish(thing: string | number | Date) {
 >      : ^^^^^^
 >toPrecision : (precision?: number) => string
 >            : ^         ^^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/controlFlowInstanceof.types b/tests/baselines/reference/controlFlowInstanceof.types
index ea0f0378e3f..fc2fe6c36b2 100644
--- a/tests/baselines/reference/controlFlowInstanceof.types
+++ b/tests/baselines/reference/controlFlowInstanceof.types
@@ -48,8 +48,8 @@ function f1(s: Set<string> | Set<number>) {
 >  : ^^^^^^^^^^^
 >add : (value: number) => Set<number>
 >    : ^     ^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function f2(s: Set<string> | Set<number>) {
@@ -97,8 +97,8 @@ function f2(s: Set<string> | Set<number>) {
 >  : ^^^^^^^^^^^
 >add : (value: number) => Set<number>
 >    : ^     ^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function f3(s: Set<string> | Set<number>) {
diff --git a/tests/baselines/reference/controlFlowInstanceofExtendsFunction.types b/tests/baselines/reference/controlFlowInstanceofExtendsFunction.types
index 31056680c9a..f2b23c88260 100644
--- a/tests/baselines/reference/controlFlowInstanceofExtendsFunction.types
+++ b/tests/baselines/reference/controlFlowInstanceofExtendsFunction.types
@@ -29,8 +29,8 @@ Function.prototype.now = function () {
 >                               : ^^^^^^^^^^^^
 
     return "now"
->"now" : string
->      : ^^^^^^
+>"now" : "now"
+>      : ^^^^^
 }
 
 class X {
diff --git a/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types b/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types
index 5ed7a91cbb4..d980a88e871 100644
--- a/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types
+++ b/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types
@@ -72,8 +72,8 @@ function f1(s: Set<string> | Set<number>) {
 >  : ^^^^^^^^^^^
 >add : (value: number) => Set<number>
 >    : ^     ^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function f2(s: Set<string> | Set<number>) {
@@ -121,8 +121,8 @@ function f2(s: Set<string> | Set<number>) {
 >  : ^^^^^^^^^^^
 >add : (value: number) => Set<number>
 >    : ^     ^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function f3(s: Set<string> | Set<number>) {
diff --git a/tests/baselines/reference/controlFlowIteration.types b/tests/baselines/reference/controlFlowIteration.types
index cbee7690c14..c58e0801a21 100644
--- a/tests/baselines/reference/controlFlowIteration.types
+++ b/tests/baselines/reference/controlFlowIteration.types
@@ -22,12 +22,12 @@ function ff() {
 >     : ^^^^^^^
 
             x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
         }
         else {
             if (x) {
diff --git a/tests/baselines/reference/controlFlowLoopAnalysis.types b/tests/baselines/reference/controlFlowLoopAnalysis.types
index 5b5663fe270..30caab5676c 100644
--- a/tests/baselines/reference/controlFlowLoopAnalysis.types
+++ b/tests/baselines/reference/controlFlowLoopAnalysis.types
@@ -12,8 +12,8 @@ function foo(x: number): number { return 1; }
 >    : ^ ^^      ^^^^^      
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function test1() {
 >test1 : () => void
@@ -49,12 +49,12 @@ function test1() {
             }
         }
         x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -69,12 +69,12 @@ function test2() {
 >  : ^^^^^^^^^^^^^^^^^^
 
     x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     while (cond) {
 >cond : boolean
diff --git a/tests/baselines/reference/controlFlowNullTypeAndLiteral.types b/tests/baselines/reference/controlFlowNullTypeAndLiteral.types
index 3865dcc5c43..f6ef549f10e 100644
--- a/tests/baselines/reference/controlFlowNullTypeAndLiteral.types
+++ b/tests/baselines/reference/controlFlowNullTypeAndLiteral.types
@@ -16,8 +16,8 @@ const objWithValMaybeNull: { val: number | null } = { val: 1 };
 >           : ^^^^^^^^^^^^^^^^
 >val : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const addOne = function (num: number) {
 >addOne : (num: number) => number
diff --git a/tests/baselines/reference/controlFlowNullishCoalesce.types b/tests/baselines/reference/controlFlowNullishCoalesce.types
index bc78597b313..7a2788cb845 100644
--- a/tests/baselines/reference/controlFlowNullishCoalesce.types
+++ b/tests/baselines/reference/controlFlowNullishCoalesce.types
@@ -7,18 +7,18 @@ let a: number;
 >  : ^^^^^^
 
 o ?? (a = 1);
->o ?? (a = 1) : number | { x: number; }
->             : ^^^^^^^^^^^^^^      ^^^
+>o ?? (a = 1) : { x: number; } | 1
+>             : ^^^^^      ^^^^^^^
 >o : { x: number; } | undefined
 >  : ^^^^^      ^^^^^^^^^^^^^^^
->(a = 1) : number
->        : ^^^^^^
->a = 1 : number
->      : ^^^^^^
+>(a = 1) : 1
+>        : ^
+>a = 1 : 1
+>      : ^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a.toString();
 >a.toString() : string
diff --git a/tests/baselines/reference/controlFlowOptionalChain.types b/tests/baselines/reference/controlFlowOptionalChain.types
index 6542d86a677..1be51c8e962 100644
--- a/tests/baselines/reference/controlFlowOptionalChain.types
+++ b/tests/baselines/reference/controlFlowOptionalChain.types
@@ -29,12 +29,12 @@ o?.[a = 1];
 >           : ^^^
 >o : { (...args: any[]): any; [key: string]: any; [key: number]: any; } | undefined
 >  : ^^^^^^    ^^     ^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a.toString();
 >a.toString() : string
@@ -59,12 +59,12 @@ o?.x[b = 1];
 >  : ^^^^^^    ^^     ^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
->b = 1 : number
->      : ^^^^^^
+>b = 1 : 1
+>      : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 b.toString();
 >b.toString() : string
@@ -85,12 +85,12 @@ o?.(c = 1)
 >           : ^^^
 >o : { (...args: any[]): any; [key: string]: any; [key: number]: any; } | undefined
 >  : ^^^^^^    ^^     ^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->c = 1 : number
->      : ^^^^^^
+>c = 1 : 1
+>      : ^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.toString();
 >c.toString() : string
@@ -115,12 +115,12 @@ o?.x(d = 1);
 >  : ^^^^^^    ^^     ^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
->d = 1 : number
->      : ^^^^^^
+>d = 1 : 1
+>      : ^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 d.toString();
 >d.toString() : string
@@ -3229,8 +3229,8 @@ const someObject: SomeObject = {
     someProperty: 42
 >someProperty : number
 >             : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/controlFlowOuterVariable.types b/tests/baselines/reference/controlFlowOuterVariable.types
index ed4bade5601..c612b2d6047 100644
--- a/tests/baselines/reference/controlFlowOuterVariable.types
+++ b/tests/baselines/reference/controlFlowOuterVariable.types
@@ -58,6 +58,6 @@ const helper = function<T>(t: T[]) {
 >  : ^^^
 >slice : (start?: number, end?: number) => T[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/controlFlowParameter.types b/tests/baselines/reference/controlFlowParameter.types
index e52a0c08afc..50e42a065e3 100644
--- a/tests/baselines/reference/controlFlowParameter.types
+++ b/tests/baselines/reference/controlFlowParameter.types
@@ -20,8 +20,8 @@ function f1(
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bad" : string
->      : ^^^^^^
+>"bad" : "bad"
+>      : ^^^^^
 
   })()
 ) {
@@ -57,12 +57,12 @@ function f2(
 >                     : ^^^^^^^^^^
 
     a = 1;
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : string | number | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   })()
 ) {
@@ -78,8 +78,8 @@ function f3(
   a: number | string | undefined = 1,
 >a : string | number | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   required: unknown = (() => {
 >required : unknown
@@ -92,12 +92,12 @@ function f3(
 >                      : ^^^^^^^^^^
 
     a = "";
->a = "" : string
->       : ^^^^^^
+>a = "" : ""
+>       : ^^
 >a : string | number | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   })()
 ) {
@@ -113,18 +113,18 @@ function f4(
   a: number | string | undefined = 1,
 >a : string | number | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   { [(a = "")]: b } = {} as any
->(a = "") : string
->         : ^^^^^^
->a = "" : string
->       : ^^^^^^
+>(a = "") : ""
+>         : ^^
+>a = "" : ""
+>       : ^^
 >a : string | number | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : any
 >  : ^^^
 >{} as any : any
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.types b/tests/baselines/reference/controlFlowPropertyDeclarations.types
index 086cbf69712..c7c36a31f00 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.types
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.types
@@ -405,8 +405,8 @@ export class HTMLtoJSX {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/\r/g : RegExp
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         .replace(/( {2,}|\n|\t|\{|\})/g, function(whitespace) {
 >replace : { (searchValue: string | RegExp, replaceValue: string): string; (searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string): string; }
@@ -452,8 +452,8 @@ export class HTMLtoJSX {
 >     : ^^^^^^
 >indexOf : (searchString: string, position?: number) => number
 >        : ^            ^^      ^^        ^^^      ^^^^^      
->'\n' : string
->     : ^^^^^^
+>'\n' : "\n"
+>     : ^^^^
 >-1 : -1
 >   : ^^
 >1 : 1
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.types b/tests/baselines/reference/controlFlowSelfReferentialLoop.types
index ab1bfe04070..fc193a10c2b 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.types
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.types
@@ -2378,8 +2378,8 @@ function getObject(id: string | number) {
   let id: string | number = 'a'
 >id : string | number
 >   : ^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
   while (1) {
 >1 : 1
diff --git a/tests/baselines/reference/controlFlowWhileStatement.types b/tests/baselines/reference/controlFlowWhileStatement.types
index 7b67aafca1c..a2e4c50053d 100644
--- a/tests/baselines/reference/controlFlowWhileStatement.types
+++ b/tests/baselines/reference/controlFlowWhileStatement.types
@@ -14,12 +14,12 @@ function a() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     while (cond) {
 >cond : boolean
@@ -39,12 +39,12 @@ function b() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     while (cond) {
 >cond : boolean
@@ -55,12 +55,12 @@ function b() {
 >  : ^^^^^^
 
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         break;
     }
@@ -74,12 +74,12 @@ function c() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     while (cond) {
 >cond : boolean
@@ -119,12 +119,12 @@ function d() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     while (x = x.length) {
 >x = x.length : number
@@ -143,12 +143,12 @@ function d() {
 >  : ^^^^^^
 
         x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 }
 function e() {
@@ -160,12 +160,12 @@ function e() {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     while (cond) {
 >cond : boolean
@@ -176,12 +176,12 @@ function e() {
 >  : ^^^^^^^^^^^^^^^
 
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         x; // number
 >x : number
diff --git a/tests/baselines/reference/controlFlowWithTemplateLiterals.types b/tests/baselines/reference/controlFlowWithTemplateLiterals.types
index 12d9acf0104..0dd4059420b 100644
--- a/tests/baselines/reference/controlFlowWithTemplateLiterals.types
+++ b/tests/baselines/reference/controlFlowWithTemplateLiterals.types
@@ -24,8 +24,8 @@ if (typeof envVar === `string`) {
 >       : ^^^^^^
 >slice : (start?: number, end?: number) => string
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 declare const obj: {test: string} | {}
@@ -55,7 +55,7 @@ if (`test` in obj) {
 >     : ^^^^^^
 >slice : (start?: number, end?: number) => string
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/copyrightWithNewLine1.types b/tests/baselines/reference/copyrightWithNewLine1.types
index 0e90c303b7d..6050e1b3dc0 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.types
+++ b/tests/baselines/reference/copyrightWithNewLine1.types
@@ -20,8 +20,8 @@ var el = document.getElementById('content');
 >         : ^^^^^^^^
 >getElementById : (elementId: string) => HTMLElement | null
 >               : ^         ^^      ^^^^^                  
->'content' : string
->          : ^^^^^^
+>'content' : "content"
+>          : ^^^^^^^^^
 
 var greeter = new model.Greeter(el);
 >greeter : any
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.types b/tests/baselines/reference/copyrightWithoutNewLine1.types
index 55b7a0e2511..20b7a0647eb 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.types
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.types
@@ -19,8 +19,8 @@ var el = document.getElementById('content');
 >         : ^^^^^^^^
 >getElementById : (elementId: string) => HTMLElement | null
 >               : ^         ^^      ^^^^^                  
->'content' : string
->          : ^^^^^^
+>'content' : "content"
+>          : ^^^^^^^^^
 
 var greeter = new model.Greeter(el);
 >greeter : any
diff --git a/tests/baselines/reference/correlatedUnions.types b/tests/baselines/reference/correlatedUnions.types
index 3452145d16c..82f0b9d0829 100644
--- a/tests/baselines/reference/correlatedUnions.types
+++ b/tests/baselines/reference/correlatedUnions.types
@@ -96,8 +96,8 @@ processRecord({ kind: 'n', v: 42, f: v => v.toExponential() });
 >    : ^^^
 >v : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >f : (v: number) => string
 >  : ^ ^^^^^^^^^^^^^^^^^^^
 >v => v.toExponential() : (v: number) => string
@@ -286,8 +286,8 @@ const handlers: HandlerMap = {
 >  : ^^^^^^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 };
 
@@ -320,8 +320,8 @@ const data: DataEntry[] = [
 >      : ^^^^^
 >data : string
 >     : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
     { type: 'foo', data: 'def' },
 >{ type: 'foo', data: 'def' } : { type: "foo"; data: string; }
@@ -332,8 +332,8 @@ const data: DataEntry[] = [
 >      : ^^^^^
 >data : string
 >     : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'def' : "def"
+>      : ^^^^^
 
     { type: 'bar', data: 42 },
 >{ type: 'bar', data: 42 } : { type: "bar"; data: number; }
@@ -344,8 +344,8 @@ const data: DataEntry[] = [
 >      : ^^^^^
 >data : number
 >     : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 ];
 
@@ -427,8 +427,8 @@ process([{ type: 'foo', data: 'abc' }]);
 >      : ^^^^^
 >data : string
 >     : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
 // --------
 
@@ -857,10 +857,10 @@ function ff1() {
 >      : ^ ^^^^^^^^^^^^^^^^^^^^^^                      ^^^^^^^^^^                                 ^^^^^      ^^ ^^^^^    ^^^^^^^^^                      ^^^^^^^^^^                                 ^^^^^^^^^^^^^^^
 >'sum' : "sum"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
     const x2 = apply('concat', 'str1', 'str2', 'str3' )
 >x2 : void
@@ -871,11 +871,11 @@ function ff1() {
 >      : ^ ^^^^^^^^^^^^^^^^^^^^^^                      ^^^^^^^^^^                                 ^^^^^      ^^ ^^^^^    ^^^^^^^^^                      ^^^^^^^^^^                                 ^^^^^^^^^^^^^^^
 >'concat' : "concat"
 >         : ^^^^^^^^
->'str1' : string
+>'str1' : "str1"
 >       : ^^^^^^
->'str2' : string
+>'str2' : "str2"
 >       : ^^^^^^
->'str3' : string
+>'str3' : "str3"
 >       : ^^^^^^
 }
 
@@ -1031,8 +1031,8 @@ const ref: MyObj = {
 >             : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     someOtherKey: { name: 42 }
 >someOtherKey : { name: number; }
@@ -1041,8 +1041,8 @@ const ref: MyObj = {
 >             : ^^^^^^^^^^^^^^^^^
 >name : number
 >     : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/createArray.types b/tests/baselines/reference/createArray.types
index 0b9b98b3c1d..9d725d8ccc1 100644
--- a/tests/baselines/reference/createArray.types
+++ b/tests/baselines/reference/createArray.types
@@ -57,8 +57,8 @@ function f(s:string):number { return 0;
 >  : ^ ^^      ^^^^^      
 >s : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 if (ba[14]) {
 >ba[14] : any
diff --git a/tests/baselines/reference/customAsyncIterator.types b/tests/baselines/reference/customAsyncIterator.types
index c3b4911f417..a31d06fdf7e 100644
--- a/tests/baselines/reference/customAsyncIterator.types
+++ b/tests/baselines/reference/customAsyncIterator.types
@@ -27,8 +27,8 @@ class ConstantIterator<T> implements AsyncIterator<T, undefined, T | undefined>
 >                                                                     : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"ConstantIterator.prototype.next may not take any values" : string
->                                                          : ^^^^^^
+>"ConstantIterator.prototype.next may not take any values" : "ConstantIterator.prototype.next may not take any values"
+>                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
         return { value: this.constant, done: false };
 >{ value: this.constant, done: false } : { value: T; done: false; }
diff --git a/tests/baselines/reference/customEventDetail.types b/tests/baselines/reference/customEventDetail.types
index 1d24001753a..e0b82bdb6c9 100644
--- a/tests/baselines/reference/customEventDetail.types
+++ b/tests/baselines/reference/customEventDetail.types
@@ -15,8 +15,8 @@ x.initCustomEvent('hello', true, true, { id: 12, name: 'hello' });
 >  : ^^^^^^^^^^^^^^^^
 >initCustomEvent : (type: string, bubbles?: boolean, cancelable?: boolean, detail?: any) => void
 >                : ^    ^^      ^^       ^^^       ^^          ^^^       ^^      ^^^^^^^^^^^    
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >true : true
diff --git a/tests/baselines/reference/dataViewConstructor.types b/tests/baselines/reference/dataViewConstructor.types
index 2c03a62e3bd..33f67be88eb 100644
--- a/tests/baselines/reference/dataViewConstructor.types
+++ b/tests/baselines/reference/dataViewConstructor.types
@@ -10,6 +10,6 @@ new DataView(new Uint8Array(32)); // should error
 >                   : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
diff --git a/tests/baselines/reference/declFileAccessors.types b/tests/baselines/reference/declFileAccessors.types
index 7cc3d41189c..74d3c794bf0 100644
--- a/tests/baselines/reference/declFileAccessors.types
+++ b/tests/baselines/reference/declFileAccessors.types
@@ -12,8 +12,8 @@ export class c1 {
 >   : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
@@ -28,8 +28,8 @@ export class c1 {
 >    : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** private setter property*/
     private set pp3(/** this is value*/value: number) {
@@ -44,8 +44,8 @@ export class c1 {
 >   : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** setter property*/
     static set s3( /** this is value*/value: number) {
@@ -59,8 +59,8 @@ export class c1 {
 >      : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     public set nc_p3(value: number) {
 >nc_p3 : number
@@ -73,8 +73,8 @@ export class c1 {
 >       : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     private set nc_pp3(value: number) {
 >nc_pp3 : number
@@ -87,8 +87,8 @@ export class c1 {
 >      : ^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     static set nc_s3(value: string) {
 >nc_s3 : string
@@ -128,8 +128,8 @@ class c2 {
 >   : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
@@ -144,8 +144,8 @@ class c2 {
 >    : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** private setter property*/
     private set pp3(/** this is value*/value: number) {
@@ -160,8 +160,8 @@ class c2 {
 >   : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     /** setter property*/
     static set s3( /** this is value*/value: number) {
@@ -175,8 +175,8 @@ class c2 {
 >      : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     public set nc_p3(value: number) {
 >nc_p3 : number
@@ -189,8 +189,8 @@ class c2 {
 >       : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     private set nc_pp3(value: number) {
 >nc_pp3 : number
@@ -203,8 +203,8 @@ class c2 {
 >      : ^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     static set nc_s3(value: string) {
 >nc_s3 : string
diff --git a/tests/baselines/reference/declFileConstructors.types b/tests/baselines/reference/declFileConstructors.types
index 289c610d97e..87c70f851a3 100644
--- a/tests/baselines/reference/declFileConstructors.types
+++ b/tests/baselines/reference/declFileConstructors.types
@@ -54,8 +54,8 @@ export class ConstructorWithRestParamters {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 }
 
@@ -172,8 +172,8 @@ class GlobalConstructorWithRestParamters {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/declFileFunctions.types b/tests/baselines/reference/declFileFunctions.types
index 40b836a49f7..e9e108d197f 100644
--- a/tests/baselines/reference/declFileFunctions.types
+++ b/tests/baselines/reference/declFileFunctions.types
@@ -45,8 +45,8 @@ export function fooWithRestParameters(a: string, ...rests: string[]) {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 export function fooWithOverloads(a: string): string;
@@ -170,8 +170,8 @@ function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function nonExportedFooWithOverloads(a: string): string;
@@ -240,8 +240,8 @@ function globalfooWithRestParameters(a: string, ...rests: string[]) {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 function globalfooWithOverloads(a: string): string;
 >globalfooWithOverloads : { (a: string): string; (a: number): number; }
diff --git a/tests/baselines/reference/declFileMethods.types b/tests/baselines/reference/declFileMethods.types
index 721504ad63d..a99cfdc9e4c 100644
--- a/tests/baselines/reference/declFileMethods.types
+++ b/tests/baselines/reference/declFileMethods.types
@@ -49,8 +49,8 @@ export class c1 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 
     public fooWithOverloads(a: string): string;
@@ -119,8 +119,8 @@ export class c1 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     private privateFooWithOverloads(a: string): string;
 >privateFooWithOverloads : { (a: string): string; (a: number): number; }
@@ -188,8 +188,8 @@ export class c1 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     static staticFooWithOverloads(a: string): string;
 >staticFooWithOverloads : { (a: string): string; (a: number): number; }
@@ -257,8 +257,8 @@ export class c1 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     private static privateStaticFooWithOverloads(a: string): string;
 >privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
@@ -370,8 +370,8 @@ class c2 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 
     public fooWithOverloads(a: string): string;
@@ -440,8 +440,8 @@ class c2 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     private privateFooWithOverloads(a: string): string;
 >privateFooWithOverloads : { (a: string): string; (a: number): number; }
@@ -509,8 +509,8 @@ class c2 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     static staticFooWithOverloads(a: string): string;
 >staticFooWithOverloads : { (a: string): string; (a: number): number; }
@@ -578,8 +578,8 @@ class c2 {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     private static privateStaticFooWithOverloads(a: string): string;
 >privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.types b/tests/baselines/reference/declFileObjectLiteralWithAccessors.types
index 45a66b8ed5a..6b6dbdd7f6e 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithAccessors.types
+++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.types
@@ -47,8 +47,8 @@ var /*4*/point = makePoint(2);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >makePoint : (x: number) => { b: number; x: number; }
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var /*2*/x = point.x;
 >x : number
@@ -61,14 +61,14 @@ var /*2*/x = point.x;
 >  : ^^^^^^
 
 point./*3*/x = 30;
->point./*3*/x = 30 : number
->                  : ^^^^^^
+>point./*3*/x = 30 : 30
+>                  : ^^
 >point./*3*/x : number
 >             : ^^^^^^
 >point : { b: number; x: number; }
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types
index eda33222d64..7eacb512da9 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types
+++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types
@@ -26,8 +26,8 @@ var /*4*/point = makePoint(2);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >makePoint : (x: number) => { readonly x: number; }
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var /*2*/x = point./*3*/x;
 >x : number
diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types
index 8643d70c656..4bb64123b9b 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types
+++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types
@@ -41,18 +41,18 @@ var /*3*/point = makePoint(2);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >makePoint : (x: number) => { b: number; x: number; }
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 point./*2*/x = 30;
->point./*2*/x = 30 : number
->                  : ^^^^^^
+>point./*2*/x = 30 : 30
+>                  : ^^
 >point./*2*/x : number
 >             : ^^^^^^
 >point : { b: number; x: number; }
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
diff --git a/tests/baselines/reference/declFileTypeAnnotationBuiltInType.types b/tests/baselines/reference/declFileTypeAnnotationBuiltInType.types
index dbd7d3dc469..3fbdf55efb4 100644
--- a/tests/baselines/reference/declFileTypeAnnotationBuiltInType.types
+++ b/tests/baselines/reference/declFileTypeAnnotationBuiltInType.types
@@ -7,8 +7,8 @@ function foo(): string {
 >    : ^^^^^^      
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 function foo2() {
 >foo2 : () => string
@@ -25,8 +25,8 @@ function foo3(): number {
 >     : ^^^^^^      
 
     return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 }
 function foo4() {
 >foo4 : () => number
diff --git a/tests/baselines/reference/declarationEmitClassAccessorsJs1.types b/tests/baselines/reference/declarationEmitClassAccessorsJs1.types
index 3d313cfe634..8634affec5c 100644
--- a/tests/baselines/reference/declarationEmitClassAccessorsJs1.types
+++ b/tests/baselines/reference/declarationEmitClassAccessorsJs1.types
@@ -15,8 +15,8 @@ export class VFile {
 >     : ^^^^^^
 
     return ''
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
   }
 
   /**
diff --git a/tests/baselines/reference/declarationEmitClassMemberWithComputedPropertyName.types b/tests/baselines/reference/declarationEmitClassMemberWithComputedPropertyName.types
index 421518b21b9..cf6f25b050c 100644
--- a/tests/baselines/reference/declarationEmitClassMemberWithComputedPropertyName.types
+++ b/tests/baselines/reference/declarationEmitClassMemberWithComputedPropertyName.types
@@ -44,8 +44,8 @@ class Foo {
 >   : ^^^^^^^^^^^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
     [k1](): string {
 >[k1] : () => string
@@ -54,8 +54,8 @@ class Foo {
 >   : ^^^^^^^^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 
     static [k2]() {
diff --git a/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.types b/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.types
index 3ce20d81feb..04b49f429b7 100644
--- a/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.types
+++ b/tests/baselines/reference/declarationEmitClassMixinLocalClassDeclaration.types
@@ -67,8 +67,8 @@ export class XmlElement2 extends Mixin(
             num: number = 0
 >num : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
         return XmlElement2;
 >XmlElement2 : typeof XmlElement2
diff --git a/tests/baselines/reference/declarationEmitClassSetAccessorParamNameInJs3.types b/tests/baselines/reference/declarationEmitClassSetAccessorParamNameInJs3.types
index 51f4078072a..118ce60175e 100644
--- a/tests/baselines/reference/declarationEmitClassSetAccessorParamNameInJs3.types
+++ b/tests/baselines/reference/declarationEmitClassSetAccessorParamNameInJs3.types
@@ -15,7 +15,7 @@ export class Foo {
 >    : ^^^^^^^^                  ^^^
 >prop : string
 >     : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/declarationEmitComputedNameCausesImportToBePainted.types b/tests/baselines/reference/declarationEmitComputedNameCausesImportToBePainted.types
index a2f76a6dbae..25a66d96e17 100644
--- a/tests/baselines/reference/declarationEmitComputedNameCausesImportToBePainted.types
+++ b/tests/baselines/reference/declarationEmitComputedNameCausesImportToBePainted.types
@@ -34,8 +34,8 @@ export const context: Context = {
 >      : ^^^^^^
 >Key : unique symbol
 >    : ^^^^^^^^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 }
 
 export const withContext = ({ [Key]: value }: Context) => value;
diff --git a/tests/baselines/reference/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types b/tests/baselines/reference/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
index 40783f3b5ef..eb1fa04abe6 100644
--- a/tests/baselines/reference/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
+++ b/tests/baselines/reference/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
@@ -15,8 +15,8 @@ export const x = add(import("./sub"));
 >    : ^ ^^ ^^          ^^^^^ 
 >import("./sub") : Promise<typeof import("sub")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./sub" : string
->        : ^^^^^^
+>"./sub" : "./sub"
+>        : ^^^^^^^
 
 export * as Q from "./sub";
 >Q : typeof import("sub")
diff --git a/tests/baselines/reference/declarationEmitExpandoWithGenericConstraint.types b/tests/baselines/reference/declarationEmitExpandoWithGenericConstraint.types
index c4b8d91a645..e57c9a4e2c9 100644
--- a/tests/baselines/reference/declarationEmitExpandoWithGenericConstraint.types
+++ b/tests/baselines/reference/declarationEmitExpandoWithGenericConstraint.types
@@ -72,8 +72,8 @@ Point.zero = (): Point => Point(0, 0);
 >            : ^^^^^
 >Point : { (x: number, y: number): Point; zero(): Point; }
 >      : ^^^ ^^      ^^ ^^      ^^^     ^^^^^^^^^^     ^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.types b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.types
index 038ff22ccff..c61879e9f17 100644
--- a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.types
+++ b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.types
@@ -50,8 +50,8 @@ export let lazyCard = () => import('./Card').then(a => a.default);
 >                      : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./Card') : Promise<typeof import("Card")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./Card' : string
->         : ^^^^^^
+>'./Card' : "./Card"
+>         : ^^^^^^^^
 >then : <TResult1 = typeof import("Card"), TResult2 = never>(onfulfilled?: (value: typeof import("Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >     : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a => a.default : (a: typeof import("Card")) => (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends2.types b/tests/baselines/reference/declarationEmitExpressionInExtends2.types
index 4257a5cc050..87d5ec07c9c 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.types
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.types
@@ -32,6 +32,6 @@ class MyClass extends getClass(2) <string, number> {
 >            : ^^^^^^^^^^^^^^^^^
 >getClass : <T>(c: T) => typeof C
 >         : ^ ^^ ^^ ^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
diff --git a/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.types b/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.types
index 78e1ffa72fa..4a3c2c6faa3 100644
--- a/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.types
+++ b/tests/baselines/reference/declarationEmitInlinedDistributiveConditional.types
@@ -18,12 +18,12 @@ const a = dropPrivateProps1({foo: 42, _bar: 'secret'}); // type is {foo: number}
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >_bar : string
 >     : ^^^^^^
->'secret' : string
->         : ^^^^^^
+>'secret' : "secret"
+>         : ^^^^^^^^
 
 //a._bar                                                // error: _bar does not exist           <===== as expected
 const b = dropPrivateProps2({foo: 42, _bar: 'secret'}); // type is {foo: number, _bar: string}
@@ -37,12 +37,12 @@ const b = dropPrivateProps2({foo: 42, _bar: 'secret'}); // type is {foo: number,
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >_bar : string
 >     : ^^^^^^
->'secret' : string
->         : ^^^^^^
+>'secret' : "secret"
+>         : ^^^^^^^^
 
 //b._bar                                                // no error, type of b._bar is string   <===== NOT expected
 
diff --git a/tests/baselines/reference/declarationEmitLateBoundAssignments.js b/tests/baselines/reference/declarationEmitLateBoundAssignments.js
index e49c61a90dd..b76db45754c 100644
--- a/tests/baselines/reference/declarationEmitLateBoundAssignments.js
+++ b/tests/baselines/reference/declarationEmitLateBoundAssignments.js
@@ -38,5 +38,5 @@ const a = foo[dashStrMem];
 export declare function foo(): void;
 export declare namespace foo {
     var bar: number;
-    var strMemName: any;
+    var strMemName: string;
 }
diff --git a/tests/baselines/reference/declarationEmitLateBoundAssignments.types b/tests/baselines/reference/declarationEmitLateBoundAssignments.types
index 27333f048ef..b0e1eedca17 100644
--- a/tests/baselines/reference/declarationEmitLateBoundAssignments.types
+++ b/tests/baselines/reference/declarationEmitLateBoundAssignments.types
@@ -28,8 +28,8 @@ const _private = Symbol();
 foo[_private] = "ok";
 >foo[_private] = "ok" : "ok"
 >                     : ^^^^
->foo[_private] : any
->              : ^^^
+>foo[_private] : string
+>              : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >_private : unique symbol
@@ -46,8 +46,8 @@ const strMem = "strMemName";
 foo[strMem] = "ok";
 >foo[strMem] = "ok" : "ok"
 >                   : ^^^^
->foo[strMem] : any
->            : ^^^
+>foo[strMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >strMem : "strMemName"
@@ -64,8 +64,8 @@ const dashStrMem = "dashed-str-mem";
 foo[dashStrMem] = "ok";
 >foo[dashStrMem] = "ok" : "ok"
 >                       : ^^^^
->foo[dashStrMem] : any
->                : ^^^
+>foo[dashStrMem] : string
+>                : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >dashStrMem : "dashed-str-mem"
@@ -82,8 +82,8 @@ const numMem = 42;
 foo[numMem] = "ok";
 >foo[numMem] = "ok" : "ok"
 >                   : ^^^^
->foo[numMem] : any
->            : ^^^
+>foo[numMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >numMem : 42
@@ -94,8 +94,8 @@ foo[numMem] = "ok";
 const x: string = foo[_private];
 >x : string
 >  : ^^^^^^
->foo[_private] : any
->              : ^^^
+>foo[_private] : string
+>              : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >_private : unique symbol
@@ -104,8 +104,8 @@ const x: string = foo[_private];
 const y: string = foo[strMem];
 >y : string
 >  : ^^^^^^
->foo[strMem] : any
->            : ^^^
+>foo[strMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >strMem : "strMemName"
@@ -114,8 +114,8 @@ const y: string = foo[strMem];
 const z: string = foo[numMem];
 >z : string
 >  : ^^^^^^
->foo[numMem] : any
->            : ^^^
+>foo[numMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >numMem : 42
@@ -124,8 +124,8 @@ const z: string = foo[numMem];
 const a: string = foo[dashStrMem];
 >a : string
 >  : ^^^^^^
->foo[dashStrMem] : any
->                : ^^^
+>foo[dashStrMem] : string
+>                : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >dashStrMem : "dashed-str-mem"
diff --git a/tests/baselines/reference/declarationEmitLateBoundAssignments2.js b/tests/baselines/reference/declarationEmitLateBoundAssignments2.js
index 34ef4dbe106..1b150435028 100644
--- a/tests/baselines/reference/declarationEmitLateBoundAssignments2.js
+++ b/tests/baselines/reference/declarationEmitLateBoundAssignments2.js
@@ -126,7 +126,7 @@ export declare namespace decl {
 }
 export declare function decl2(): void;
 export declare namespace decl2 {
-    var C: any;
+    var C: number;
 }
 export declare function decl3(): void;
 export declare namespace decl3 { }
@@ -150,7 +150,7 @@ export declare const arrow: {
 };
 export declare const arrow2: {
     (): void;
-    C: any;
+    C: number;
 };
 export declare const arrow3: {
     (): void;
@@ -158,7 +158,7 @@ export declare const arrow3: {
 };
 export declare const arrow4: {
     (): void;
-    1: any;
+    1: number;
 };
 export declare const arrow5: {
     (): void;
@@ -166,7 +166,7 @@ export declare const arrow5: {
 };
 export declare const arrow6: {
     (): void;
-    "10": any;
+    "10": number;
 };
 export declare const arrow7: {
     (): void;
@@ -174,7 +174,7 @@ export declare const arrow7: {
 };
 export declare const arrow8: {
     (): void;
-    "foo bar": any;
+    "foo bar": number;
 };
 export declare const arrow9: {
     (): void;
@@ -182,5 +182,5 @@ export declare const arrow9: {
 };
 export declare const arrow10: {
     (): void;
-    "\uD83E\uDD37\u200D\u2642\uFE0F": any;
+    "\uD83E\uDD37\u200D\u2642\uFE0F": number;
 };
diff --git a/tests/baselines/reference/declarationEmitLateBoundAssignments2.types b/tests/baselines/reference/declarationEmitLateBoundAssignments2.types
index 070d1ee0644..72e3e7bd205 100644
--- a/tests/baselines/reference/declarationEmitLateBoundAssignments2.types
+++ b/tests/baselines/reference/declarationEmitLateBoundAssignments2.types
@@ -56,8 +56,8 @@ export function decl2() {}
 decl2[c] = 0
 >decl2[c] = 0 : 0
 >             : ^
->decl2[c] : any
->         : ^^^
+>decl2[c] : number
+>         : ^^^^^^
 >decl2 : typeof decl2
 >      : ^^^^^^^^^^^^
 >c : "C"
@@ -88,8 +88,8 @@ export function decl4() {}
 decl4[num] = 0
 >decl4[num] = 0 : 0
 >               : ^
->decl4[num] : any
->           : ^^^
+>decl4[num] : number
+>           : ^^^^^^
 >decl4 : typeof decl4
 >      : ^^^^^^^^^^^^
 >num : 1
@@ -120,8 +120,8 @@ export function decl6() {}
 decl6[numStr] = 0
 >decl6[numStr] = 0 : 0
 >                  : ^
->decl6[numStr] : any
->              : ^^^
+>decl6[numStr] : number
+>              : ^^^^^^
 >decl6 : typeof decl6
 >      : ^^^^^^^^^^^^
 >numStr : "10"
@@ -152,8 +152,8 @@ export function decl8() {}
 decl8[withWhitespace] = 0
 >decl8[withWhitespace] = 0 : 0
 >                          : ^
->decl8[withWhitespace] : any
->                      : ^^^
+>decl8[withWhitespace] : number
+>                      : ^^^^^^
 >decl8 : typeof decl8
 >      : ^^^^^^^^^^^^
 >withWhitespace : "foo bar"
@@ -184,8 +184,8 @@ export function decl10() {}
 decl10[emoji] = 0
 >decl10[emoji] = 0 : 0
 >                  : ^
->decl10[emoji] : any
->              : ^^^
+>decl10[emoji] : number
+>              : ^^^^^^
 >decl10 : typeof decl10
 >       : ^^^^^^^^^^^^^
 >emoji : "🤷‍♂️"
@@ -212,18 +212,18 @@ arrow["B"] = 'bar'
 >      : ^^^^^
 
 export const arrow2 = () => {}
->arrow2 : { (): void; C: any; }
->       : ^^^^^^^^^^^^^^^^^^^^^
->() => {} : { (): void; C: any; }
->         : ^^^^^^^^^^^^^^^^^^^^^
+>arrow2 : { (): void; C: number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^
+>() => {} : { (): void; C: number; }
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 arrow2[c] = 100
 >arrow2[c] = 100 : 100
 >                : ^^^
->arrow2[c] : any
->          : ^^^
->arrow2 : { (): void; C: any; }
->       : ^^^^^^^^^^^^^^^^^^^^^
+>arrow2[c] : number
+>          : ^^^^^^
+>arrow2 : { (): void; C: number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >c : "C"
 >  : ^^^
 >100 : 100
@@ -248,18 +248,18 @@ arrow3[77] = 0
 >  : ^
 
 export const arrow4 = () => {}
->arrow4 : { (): void; 1: any; }
->       : ^^^^^^^^^^^^^^^^^^^^^
->() => {} : { (): void; 1: any; }
->         : ^^^^^^^^^^^^^^^^^^^^^
+>arrow4 : { (): void; 1: number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^
+>() => {} : { (): void; 1: number; }
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 arrow4[num] = 0
 >arrow4[num] = 0 : 0
 >                : ^
->arrow4[num] : any
->            : ^^^
->arrow4 : { (): void; 1: any; }
->       : ^^^^^^^^^^^^^^^^^^^^^
+>arrow4[num] : number
+>            : ^^^^^^
+>arrow4 : { (): void; 1: number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >num : 1
 >    : ^
 >0 : 0
@@ -284,18 +284,18 @@ arrow5["101"] = 0
 >  : ^
 
 export const arrow6 = () => {}
->arrow6 : { (): void; "10": any; }
->       : ^^^^^^^^^^^^^^^^^^^^^^^^
->() => {} : { (): void; "10": any; }
->         : ^^^^^^^^^^^^^^^^^^^^^^^^
+>arrow6 : { (): void; "10": number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>() => {} : { (): void; "10": number; }
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 arrow6[numStr] = 0
 >arrow6[numStr] = 0 : 0
 >                   : ^
->arrow6[numStr] : any
->               : ^^^
->arrow6 : { (): void; "10": any; }
->       : ^^^^^^^^^^^^^^^^^^^^^^^^
+>arrow6[numStr] : number
+>               : ^^^^^^
+>arrow6 : { (): void; "10": number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >numStr : "10"
 >       : ^^^^
 >0 : 0
@@ -320,18 +320,18 @@ arrow7["qwe rty"] = 0
 >  : ^
 
 export const arrow8 = () => {}
->arrow8 : { (): void; "foo bar": any; }
->       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->() => {} : { (): void; "foo bar": any; }
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>arrow8 : { (): void; "foo bar": number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>() => {} : { (): void; "foo bar": number; }
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 arrow8[withWhitespace] = 0
 >arrow8[withWhitespace] = 0 : 0
 >                           : ^
->arrow8[withWhitespace] : any
->                       : ^^^
->arrow8 : { (): void; "foo bar": any; }
->       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>arrow8[withWhitespace] : number
+>                       : ^^^^^^
+>arrow8 : { (): void; "foo bar": number; }
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >withWhitespace : "foo bar"
 >               : ^^^^^^^^^
 >0 : 0
@@ -356,18 +356,18 @@ arrow9["🤪"] = 0
 >  : ^
 
 export const arrow10 = () => {}
->arrow10 : { (): void; "\uD83E\uDD37\u200D\u2642\uFE0F": any; }
->        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->() => {} : { (): void; "\uD83E\uDD37\u200D\u2642\uFE0F": any; }
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>arrow10 : { (): void; "\uD83E\uDD37\u200D\u2642\uFE0F": number; }
+>        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>() => {} : { (): void; "\uD83E\uDD37\u200D\u2642\uFE0F": number; }
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 arrow10[emoji] = 0
 >arrow10[emoji] = 0 : 0
 >                   : ^
->arrow10[emoji] : any
->               : ^^^
->arrow10 : { (): void; "\uD83E\uDD37\u200D\u2642\uFE0F": any; }
->        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>arrow10[emoji] : number
+>               : ^^^^^^
+>arrow10 : { (): void; "\uD83E\uDD37\u200D\u2642\uFE0F": number; }
+>        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >emoji : "🤷‍♂️"
 >      : ^^^^^^^
 >0 : 0
diff --git a/tests/baselines/reference/declarationEmitLateBoundJSAssignments.js b/tests/baselines/reference/declarationEmitLateBoundJSAssignments.js
index 79c32f92f41..56d1f7860c7 100644
--- a/tests/baselines/reference/declarationEmitLateBoundJSAssignments.js
+++ b/tests/baselines/reference/declarationEmitLateBoundJSAssignments.js
@@ -28,5 +28,5 @@ const a = foo[dashStrMem];
 export function foo(): void;
 export namespace foo {
     let bar: number;
-    let strMemName: any;
+    let strMemName: string;
 }
diff --git a/tests/baselines/reference/declarationEmitLateBoundJSAssignments.types b/tests/baselines/reference/declarationEmitLateBoundJSAssignments.types
index 845e1b71ba4..91cd4d75e46 100644
--- a/tests/baselines/reference/declarationEmitLateBoundJSAssignments.types
+++ b/tests/baselines/reference/declarationEmitLateBoundJSAssignments.types
@@ -28,8 +28,8 @@ const _private = Symbol();
 foo[_private] = "ok";
 >foo[_private] = "ok" : "ok"
 >                     : ^^^^
->foo[_private] : any
->              : ^^^
+>foo[_private] : string
+>              : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >_private : unique symbol
@@ -46,8 +46,8 @@ const strMem = "strMemName";
 foo[strMem] = "ok";
 >foo[strMem] = "ok" : "ok"
 >                   : ^^^^
->foo[strMem] : any
->            : ^^^
+>foo[strMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >strMem : "strMemName"
@@ -64,8 +64,8 @@ const dashStrMem = "dashed-str-mem";
 foo[dashStrMem] = "ok";
 >foo[dashStrMem] = "ok" : "ok"
 >                       : ^^^^
->foo[dashStrMem] : any
->                : ^^^
+>foo[dashStrMem] : string
+>                : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >dashStrMem : "dashed-str-mem"
@@ -82,8 +82,8 @@ const numMem = 42;
 foo[numMem] = "ok";
 >foo[numMem] = "ok" : "ok"
 >                   : ^^^^
->foo[numMem] : any
->            : ^^^
+>foo[numMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >numMem : 42
@@ -95,8 +95,8 @@ foo[numMem] = "ok";
 const x = foo[_private];
 >x : string
 >  : ^^^^^^
->foo[_private] : any
->              : ^^^
+>foo[_private] : string
+>              : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >_private : unique symbol
@@ -106,8 +106,8 @@ const x = foo[_private];
 const y = foo[strMem];
 >y : string
 >  : ^^^^^^
->foo[strMem] : any
->            : ^^^
+>foo[strMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >strMem : "strMemName"
@@ -117,8 +117,8 @@ const y = foo[strMem];
 const z = foo[numMem];
 >z : string
 >  : ^^^^^^
->foo[numMem] : any
->            : ^^^
+>foo[numMem] : string
+>            : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >numMem : 42
@@ -128,8 +128,8 @@ const z = foo[numMem];
 const a = foo[dashStrMem];
 >a : string
 >  : ^^^^^^
->foo[dashStrMem] : any
->                : ^^^
+>foo[dashStrMem] : string
+>                : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >dashStrMem : "dashed-str-mem"
diff --git a/tests/baselines/reference/declarationEmitMappedTypePropertyFromNumericStringKey.types b/tests/baselines/reference/declarationEmitMappedTypePropertyFromNumericStringKey.types
index 94cb3761690..dfb60de7132 100644
--- a/tests/baselines/reference/declarationEmitMappedTypePropertyFromNumericStringKey.types
+++ b/tests/baselines/reference/declarationEmitMappedTypePropertyFromNumericStringKey.types
@@ -18,6 +18,6 @@ export const f = (<T>(arg: {[K in keyof T]: T[K] | string}) => arg)({'0': 0}); /
 >         : ^^^^^^^^^^^^^^^^
 >'0' : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/declarationEmitObjectLiteralAccessors1.types b/tests/baselines/reference/declarationEmitObjectLiteralAccessors1.types
index 43e968bc7d8..002c7ee8fb1 100644
--- a/tests/baselines/reference/declarationEmitObjectLiteralAccessors1.types
+++ b/tests/baselines/reference/declarationEmitObjectLiteralAccessors1.types
@@ -14,8 +14,8 @@ export const obj1 = {
 >  : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
   /** my awesome setter (second in source order) */
@@ -40,8 +40,8 @@ export const obj2 = {
 >  : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
   /** my awesome setter */
@@ -65,8 +65,8 @@ export const obj3 = {
 >  : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
 };
diff --git a/tests/baselines/reference/declarationEmitObjectLiteralAccessorsJs1.types b/tests/baselines/reference/declarationEmitObjectLiteralAccessorsJs1.types
index c517ad0ae34..0140b816302 100644
--- a/tests/baselines/reference/declarationEmitObjectLiteralAccessorsJs1.types
+++ b/tests/baselines/reference/declarationEmitObjectLiteralAccessorsJs1.types
@@ -17,8 +17,8 @@ export const obj1 = {
 >  : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
   /** 
@@ -49,8 +49,8 @@ export const obj2 = {
 >  : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
   /** 
@@ -80,8 +80,8 @@ export const obj3 = {
 >  : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   },
 };
diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.types b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.types
index 23201d9a0b3..e9160c33634 100644
--- a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.types
+++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.types
@@ -10,10 +10,10 @@ export default createSvgIcon("Hello", "ArrowLeft");
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >createSvgIcon : (path: string, displayName: string) => import("packages/core/src/SvgIcon").SomeInterface
 >              : ^    ^^      ^^           ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->"ArrowLeft" : string
->            : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>"ArrowLeft" : "ArrowLeft"
+>            : ^^^^^^^^^^^
 
 === packages/core/src/SvgIcon.d.ts ===
 import { StyledComponentProps } from "@ts-bug/styles";
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types
index 44280225e61..cf4b630ac09 100644
--- a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types
@@ -35,7 +35,7 @@ export default {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >scalar : (value: string) => import("src/lib/operators/scalar").Scalar
 >       : ^     ^^      ^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^
->"14px" : string
+>"14px" : "14px"
 >       : ^^^^^^
 	}
 };
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types
index 7c9c5258512..559a5f7c64d 100644
--- a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types
@@ -35,7 +35,7 @@ export default {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >scalar : (value: string) => import("src/lib/operators/scalar").Scalar
 >       : ^     ^^      ^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^
->"14px" : string
+>"14px" : "14px"
 >       : ^^^^^^
 	}
 };
diff --git a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.types b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.types
index e575cc9d59a..40fa2785aa5 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.types
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.types
@@ -23,8 +23,8 @@ export class C {
 >    : ^^^^^^
 >x : unique symbol
 >  : ^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === c.ts ===
diff --git a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationToBeEmitted.types b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationToBeEmitted.types
index a2550b5aa42..b66564e1bd9 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationToBeEmitted.types
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationToBeEmitted.types
@@ -8,7 +8,7 @@ const _data = Symbol('data');
 >               : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'data' : string
+>'data' : "data"
 >       : ^^^^^^
 
 export class User {
diff --git a/tests/baselines/reference/declarationEmitProtectedMembers.types b/tests/baselines/reference/declarationEmitProtectedMembers.types
index 8cc08f38521..8d5f29fb516 100644
--- a/tests/baselines/reference/declarationEmitProtectedMembers.types
+++ b/tests/baselines/reference/declarationEmitProtectedMembers.types
@@ -32,8 +32,8 @@ class C1 {
     protected get accessor() { return 0; }
 >accessor : number
 >         : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected static sx: number;
 >sx : number
diff --git a/tests/baselines/reference/declarationEmitReadonlyComputedProperty.types b/tests/baselines/reference/declarationEmitReadonlyComputedProperty.types
index 7d0e8ea2666..8522029af67 100644
--- a/tests/baselines/reference/declarationEmitReadonlyComputedProperty.types
+++ b/tests/baselines/reference/declarationEmitReadonlyComputedProperty.types
@@ -30,8 +30,8 @@ export function createInstance(): Interface {
 >         : ^^^^^^
 >SYMBOL : unique symbol
 >       : ^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
   }
 }
 
diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference.types b/tests/baselines/reference/declarationEmitReexportedSymlinkReference.types
index eb87dfefdcf..84491c53a5c 100644
--- a/tests/baselines/reference/declarationEmitReexportedSymlinkReference.types
+++ b/tests/baselines/reference/declarationEmitReexportedSymlinkReference.types
@@ -19,8 +19,8 @@ export const ADMIN = MetadataAccessor.create<boolean>('1');
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
 >       : ^ ^^ ^^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^      ^^^^^                      
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 
 === monorepo/pkg1/dist/index.d.ts ===
 
diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.types b/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.types
index ec738c1633d..9255b91a487 100644
--- a/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.types
+++ b/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.types
@@ -19,8 +19,8 @@ export const ADMIN = MetadataAccessor.create<boolean>('1');
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
 >       : ^ ^^ ^^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^      ^^^^^                      
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 
 === monorepo/pkg1/dist/index.d.ts ===
 
diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.types b/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.types
index eb55a76d420..4c53f672d43 100644
--- a/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.types
+++ b/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.types
@@ -19,8 +19,8 @@ export const ADMIN = MetadataAccessor.create<boolean>('1');
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
 >       : ^ ^^ ^^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^      ^^^^^                      
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 
 === monorepo/pkg1/dist/index.d.ts ===
 
diff --git a/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.types b/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.types
index 45f16d6c639..dee5a3fcd4a 100644
--- a/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.types
+++ b/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.types
@@ -61,8 +61,8 @@ export class A {
 >         : ^^^^^^^^^^^^^^^
 >Test1 : TestEnum.Test1
 >      : ^^^^^^^^^^^^^^
->'123' : string
->      : ^^^^^^
+>'123' : "123"
+>      : ^^^^^
 
             [TestEnum.Test2]: '123',
 >[TestEnum.Test2] : string
@@ -73,8 +73,8 @@ export class A {
 >         : ^^^^^^^^^^^^^^^
 >Test2 : TestEnum.Test2
 >      : ^^^^^^^^^^^^^^
->'123' : string
->      : ^^^^^^
+>'123' : "123"
+>      : ^^^^^
 
         };
     }
diff --git a/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules1.types b/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules1.types
index 89dcad87702..6a76d95abaf 100644
--- a/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules1.types
+++ b/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules1.types
@@ -586,10 +586,10 @@ export const useEntries = () => {
 >     : ^^^^^^^^
 >slice : (start?: number, end?: number) => IEntry[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 
   })
 }
diff --git a/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules2.types b/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules2.types
index 1bb4797a3ff..4ebf94645ea 100644
--- a/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules2.types
+++ b/tests/baselines/reference/declarationEmitUsingAlternativeContainingModules2.types
@@ -594,10 +594,10 @@ export const useEntries = () => {
 >     : ^^^^^^^^
 >slice : (start?: number, end?: number) => IEntry[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 
   })
 }
diff --git a/tests/baselines/reference/declarationFileForHtmlFileWithinDeclarationFile.types b/tests/baselines/reference/declarationFileForHtmlFileWithinDeclarationFile.types
index c09a6bf4998..06476601d66 100644
--- a/tests/baselines/reference/declarationFileForHtmlFileWithinDeclarationFile.types
+++ b/tests/baselines/reference/declarationFileForHtmlFileWithinDeclarationFile.types
@@ -51,8 +51,8 @@ window.customElements.define("my-html5-element", mod.HTML5Element);
 >               : ^^^^^^^^^^^^^^^^^^^^^
 >define : (name: string, constructor: CustomElementConstructor, options?: ElementDefinitionOptions) => void
 >       : ^    ^^      ^^           ^^                        ^^       ^^^                        ^^^^^    
->"my-html5-element" : string
->                   : ^^^^^^
+>"my-html5-element" : "my-html5-element"
+>                   : ^^^^^^^^^^^^^^^^^^
 >mod.HTML5Element : typeof mod.HTML5Element
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >mod : typeof mod
diff --git a/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=false).types b/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=false).types
index bc213cee49f..5a933b64860 100644
--- a/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=false).types
+++ b/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=false).types
@@ -46,8 +46,8 @@ window.customElements.define("my-html5-element", mod.HTML5Element);
 >               : ^^^^^^^^^^^^^^^^^^^^^
 >define : (name: string, constructor: CustomElementConstructor, options?: ElementDefinitionOptions) => void
 >       : ^    ^^      ^^           ^^                        ^^       ^^^                        ^^^^^    
->"my-html5-element" : string
->                   : ^^^^^^
+>"my-html5-element" : "my-html5-element"
+>                   : ^^^^^^^^^^^^^^^^^^
 >mod.HTML5Element : any
 >                 : ^^^
 >mod : any
diff --git a/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=true).types b/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=true).types
index 868e033bd36..f4b3ed62e89 100644
--- a/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=true).types
+++ b/tests/baselines/reference/declarationFileForHtmlImport(allowarbitraryextensions=true).types
@@ -46,8 +46,8 @@ window.customElements.define("my-html5-element", mod.HTML5Element);
 >               : ^^^^^^^^^^^^^^^^^^^^^
 >define : (name: string, constructor: CustomElementConstructor, options?: ElementDefinitionOptions) => void
 >       : ^    ^^      ^^           ^^                        ^^       ^^^                        ^^^^^    
->"my-html5-element" : string
->                   : ^^^^^^
+>"my-html5-element" : "my-html5-element"
+>                   : ^^^^^^^^^^^^^^^^^^
 >mod.HTML5Element : typeof mod.HTML5Element
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >mod : typeof mod
diff --git a/tests/baselines/reference/declarationFilesForNodeNativeModules(allowarbitraryextensions=true).types b/tests/baselines/reference/declarationFilesForNodeNativeModules(allowarbitraryextensions=true).types
index 8684927c0fb..15f33fb70a2 100644
--- a/tests/baselines/reference/declarationFilesForNodeNativeModules(allowarbitraryextensions=true).types
+++ b/tests/baselines/reference/declarationFilesForNodeNativeModules(allowarbitraryextensions=true).types
@@ -14,7 +14,7 @@ mod.doNativeThing("good");
 >    : ^^^^^^^^^^
 >doNativeThing : (flag: string) => unknown
 >              : ^    ^^      ^^^^^       
->"good" : string
+>"good" : "good"
 >       : ^^^^^^
 
 === dir/native.d.node.ts ===
diff --git a/tests/baselines/reference/declarationMapsMultifile.types b/tests/baselines/reference/declarationMapsMultifile.types
index 5d18979dc9b..a39bd25e008 100644
--- a/tests/baselines/reference/declarationMapsMultifile.types
+++ b/tests/baselines/reference/declarationMapsMultifile.types
@@ -62,8 +62,8 @@ c.doThing({a: 42});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 export let x = c.doThing({a: 12});
 >x : { b: number; }
@@ -80,8 +80,8 @@ export let x = c.doThing({a: 12});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 export { c, Foo };
 >c : Foo
diff --git a/tests/baselines/reference/declarationMapsOutFile.types b/tests/baselines/reference/declarationMapsOutFile.types
index d66780f3aa8..b34dd93d14a 100644
--- a/tests/baselines/reference/declarationMapsOutFile.types
+++ b/tests/baselines/reference/declarationMapsOutFile.types
@@ -62,8 +62,8 @@ c.doThing({a: 42});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 export let x = c.doThing({a: 12});
 >x : { b: number; }
@@ -80,8 +80,8 @@ export let x = c.doThing({a: 12});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 export { c, Foo };
 >c : Foo
diff --git a/tests/baselines/reference/declarationMapsOutFile2.types b/tests/baselines/reference/declarationMapsOutFile2.types
index e37793ac47b..5f3a5e48afa 100644
--- a/tests/baselines/reference/declarationMapsOutFile2.types
+++ b/tests/baselines/reference/declarationMapsOutFile2.types
@@ -58,8 +58,8 @@ c.doThing({a: 42});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let x = c.doThing({a: 12});
 >x : { b: number; }
@@ -76,6 +76,6 @@ let x = c.doThing({a: 12});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
diff --git a/tests/baselines/reference/declarationMapsWithSourceMap.types b/tests/baselines/reference/declarationMapsWithSourceMap.types
index 69144c8dd9e..84a472e3bba 100644
--- a/tests/baselines/reference/declarationMapsWithSourceMap.types
+++ b/tests/baselines/reference/declarationMapsWithSourceMap.types
@@ -58,8 +58,8 @@ c.doThing({a: 42});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let x = c.doThing({a: 12});
 >x : { b: number; }
@@ -76,6 +76,6 @@ let x = c.doThing({a: 12});
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
diff --git a/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types b/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types
index 8a2cfad4cd6..42c14378557 100644
--- a/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types
+++ b/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types
@@ -47,8 +47,8 @@ const MAP: StringHash = {
     a: "a"
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 
@@ -61,8 +61,8 @@ const MAP2: StringHash2 = {
     a: "a"
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 
diff --git a/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.types b/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.types
index 9553b836d14..8b6dcc6e55a 100644
--- a/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.types
+++ b/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.types
@@ -64,6 +64,6 @@ export const MyComp = Ctor.extends({foo: "bar"});
 >             : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
index a956a3c17e5..b316511915c 100644
--- a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
+++ b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
@@ -239,8 +239,8 @@ let p1 = testRecFun({ one: '1' })
 >             : ^^^^^^^^^^^^^^^^
 >one : string
 >    : ^^^^^^
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 
 void p1.result.one;
 >void p1.result.one : undefined
@@ -271,8 +271,8 @@ let p2 = p1.deeper({ two: '2' })
 >             : ^^^^^^^^^^^^^^^^
 >two : string
 >    : ^^^^^^
->'2' : string
->    : ^^^^^^
+>'2' : "2"
+>    : ^^^
 
 void p2.result.one;
 >void p2.result.one : undefined
@@ -317,8 +317,8 @@ let p3 = p2.deeper({ three: '3' })
 >               : ^^^^^^^^^^^^^^^^^^
 >three : string
 >      : ^^^^^^
->'3' : string
->    : ^^^^^^
+>'3' : "3"
+>    : ^^^
 
 void p3.result.one;
 >void p3.result.one : undefined
diff --git a/tests/baselines/reference/decoratorInAmbientContext.types b/tests/baselines/reference/decoratorInAmbientContext.types
index a8a39b9fb56..3438a43e336 100644
--- a/tests/baselines/reference/decoratorInAmbientContext.types
+++ b/tests/baselines/reference/decoratorInAmbientContext.types
@@ -14,8 +14,8 @@ const b = Symbol('b');
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
 class Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.types b/tests/baselines/reference/decoratorMetadataOnInferredType.types
index a1616639fca..1805985fa8d 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.types
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.types
@@ -26,8 +26,8 @@ class A {
 >        : ^^^^^^   ^^      ^^^    ^^^
 >log : (msg: string) => void
 >    : ^   ^^      ^^^^^    
->'new A' : string
->        : ^^^^^^
+>'new A' : "new A"
+>        : ^^^^^^^
 }
 
 function decorator(target: Object, propertyKey: string) {
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.types b/tests/baselines/reference/decoratorMetadataWithConstructorType.types
index 86d2a66f399..30ac58e52bd 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.types
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.types
@@ -26,8 +26,8 @@ class A {
 >        : ^^^^^^   ^^      ^^^    ^^^
 >log : (msg: string) => void
 >    : ^   ^^      ^^^^^    
->'new A' : string
->        : ^^^^^^
+>'new A' : "new A"
+>        : ^^^^^^^
 }
 
 function decorator(target: Object, propertyKey: string) {
diff --git a/tests/baselines/reference/decoratorOnClassAccessor7.types b/tests/baselines/reference/decoratorOnClassAccessor7.types
index 6599be13615..5f8cf8f015c 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor7.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor7.types
@@ -30,8 +30,8 @@ class A {
 >     : ^ ^^      ^^   ^^           ^^      ^^          ^^                          ^^^^^                          
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set x(value: number) { }
 >x : number
@@ -47,8 +47,8 @@ class B {
     get x() { return 0; }
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     @dec2 set x(value: number) { }
 >dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
@@ -74,8 +74,8 @@ class C {
     get x() { return 0; }
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class D {
@@ -93,8 +93,8 @@ class D {
 >     : ^ ^^      ^^   ^^           ^^      ^^          ^^                          ^^^^^                          
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class E {
@@ -106,8 +106,8 @@ class E {
 >     : ^ ^^      ^^   ^^           ^^      ^^          ^^                          ^^^^^                          
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     @dec2 set x(value: number) { }
 >dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
@@ -135,6 +135,6 @@ class F {
 >     : ^ ^^      ^^   ^^           ^^      ^^          ^^                          ^^^^^                          
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
diff --git a/tests/baselines/reference/decoratorOnClassAccessor8.types b/tests/baselines/reference/decoratorOnClassAccessor8.types
index f2135595212..c6588ff3971 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor8.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor8.types
@@ -19,8 +19,8 @@ class A {
 >    : ^ ^^      ^^   ^^           ^^      ^^          ^^                          ^^^^^                          
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set x(value: number) { }
 >x : number
@@ -36,8 +36,8 @@ class B {
     get x() { return 0; }
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     @dec set x(value: number) { }
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
@@ -63,8 +63,8 @@ class C {
     get x() { return 0; }
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class D {
@@ -82,8 +82,8 @@ class D {
 >    : ^ ^^      ^^   ^^           ^^      ^^          ^^                          ^^^^^                          
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class E {
diff --git a/tests/baselines/reference/decoratorReferences.types b/tests/baselines/reference/decoratorReferences.types
index 3655120c808..fed54c2520a 100644
--- a/tests/baselines/reference/decoratorReferences.types
+++ b/tests/baselines/reference/decoratorReferences.types
@@ -17,8 +17,8 @@ type T = number;
 >  : ^^^^    ^^     ^^^^^   
 >1 as T : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >() => C : () => typeof C
 >        : ^^^^^^^^^^^^^^
 >C : typeof C
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.types b/tests/baselines/reference/decoratorsOnComputedProperties.types
index c3b47f4407e..13b17254d9c 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.types
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.types
@@ -30,20 +30,20 @@ function foo(): string { return ++i + ""; }
 const fieldNameA: string = "fieldName1";
 >fieldNameA : string
 >           : ^^^^^^
->"fieldName1" : string
->             : ^^^^^^
+>"fieldName1" : "fieldName1"
+>             : ^^^^^^^^^^^^
 
 const fieldNameB: string = "fieldName2";
 >fieldNameB : string
 >           : ^^^^^^
->"fieldName2" : string
->             : ^^^^^^
+>"fieldName2" : "fieldName2"
+>             : ^^^^^^^^^^^^
 
 const fieldNameC: string = "fieldName3";
 >fieldNameC : string
 >           : ^^^^^^
->"fieldName3" : string
->             : ^^^^^^
+>"fieldName3" : "fieldName3"
+>             : ^^^^^^^^^^^^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.types b/tests/baselines/reference/decrementOperatorWithNumberType.types
index 9c9d57b7fe5..9e62698d3db 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberType.types
+++ b/tests/baselines/reference/decrementOperatorWithNumberType.types
@@ -11,10 +11,10 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types
index aa1439b969a..211d6a62870 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types
+++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types
index f6ff5ac695e..980933beee7 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", ""];
 >        : ^^^^^^^^
 >["", ""] : string[]
 >         : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
 function foo(): string { return ""; }
 >foo : () => string
 >    : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types
index 45c9dd14930..b196726905f 100644
--- a/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types
+++ b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types
@@ -42,8 +42,8 @@ function foo1(): () => Foo {
 >        : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 function foo3(): Foo[] {
@@ -57,8 +57,8 @@ function foo3(): Foo[] {
 >        : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 var y: Foo[] = [{a: ''}]
 >y : Foo[]
@@ -69,6 +69,6 @@ var y: Foo[] = [{a: ''}]
 >        : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/deepExcessPropertyCheckingWhenTargetIsIntersection.types b/tests/baselines/reference/deepExcessPropertyCheckingWhenTargetIsIntersection.types
index fd8d0b924a2..eb415204816 100644
--- a/tests/baselines/reference/deepExcessPropertyCheckingWhenTargetIsIntersection.types
+++ b/tests/baselines/reference/deepExcessPropertyCheckingWhenTargetIsIntersection.types
@@ -61,8 +61,8 @@ TestComponent({icon: { props: { INVALID_PROP_NAME: 'share', ariaLabel: 'test lab
 >        : ^^^^^^^
 >ariaLabel : string
 >          : ^^^^^^
->'test label' : string
->             : ^^^^^^
+>'test label' : "test label"
+>             : ^^^^^^^^^^^^
 
 const TestComponent2: StatelessComponent<TestProps | {props2: {x: number}}> = (props) => {
 >TestComponent2 : StatelessComponent<TestProps | { props2: { x: number; }; }>
@@ -100,6 +100,6 @@ TestComponent2({icon: { props: { INVALID_PROP_NAME: 'share', ariaLabel: 'test la
 >        : ^^^^^^^
 >ariaLabel : string
 >          : ^^^^^^
->'test label' : string
->             : ^^^^^^
+>'test label' : "test label"
+>             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/deeplyNestedCheck.types b/tests/baselines/reference/deeplyNestedCheck.types
index 401a6826d32..de544441121 100644
--- a/tests/baselines/reference/deeplyNestedCheck.types
+++ b/tests/baselines/reference/deeplyNestedCheck.types
@@ -146,8 +146,8 @@ const a1: string[][][][][] = [[[[[42]]]]];
 >       : ^^^^^^^^^^
 >[42] : number[]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 const a2: string[][][][][][][][][][] = [[[[[[[[[[42]]]]]]]]]];
 >a2 : string[][][][][][][][][][]
@@ -172,6 +172,6 @@ const a2: string[][][][][][][][][][] = [[[[[[[[[[42]]]]]]]]]];
 >       : ^^^^^^^^^^
 >[42] : number[]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.types b/tests/baselines/reference/defaultArgsInFunctionExpressions.types
index 2484a045502..07a036eac06 100644
--- a/tests/baselines/reference/defaultArgsInFunctionExpressions.types
+++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.types
@@ -20,8 +20,8 @@ var n: number = f(4);
 >     : ^^^^^^
 >f : (a?: number) => number
 >  : ^ ^^^^^^^^^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 n = f();
 >n = f() : number
@@ -40,8 +40,8 @@ var s: string = f('');
 >      : ^^^^^^
 >f : (a?: number) => number
 >  : ^ ^^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 s = f();
 >s = f() : number
@@ -61,8 +61,8 @@ var f2 = function (a: string = 3) { return a; }; // Should error, but be of type
 >                                       : ^ ^^^      ^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >a : string
 >  : ^^^^^^
 
@@ -75,8 +75,8 @@ s = f2('');
 >       : ^^^^^^
 >f2 : (a?: string) => string
 >   : ^ ^^^      ^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 s = f2();
 >s = f2() : string
@@ -127,8 +127,8 @@ var f4: (a: number) => void = function (a = "") { };
 >                      : ^ ^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 // Contextually type the default arg using the function's contextual type
 var f5: (a: (s: string) => any) => void = function (a = s => <number>s) { };
diff --git a/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types b/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types
index 793eb469f53..46b9066d53e 100644
--- a/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types
+++ b/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types
@@ -70,10 +70,10 @@ var result2 = concat2(1, ""); // result2 will be number|string
 >               : ^^^
 >concat2 : <T, U>(x: T, y: U) => any
 >        : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 
 var elementCount2 = result.length; 
 >elementCount2 : any
diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
index 1dac8ac93d6..2bac91a9434 100644
--- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
+++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
@@ -26,8 +26,8 @@ function f(addUndefined1 = "J", addUndefined2?: number) {
 >                   : ^^^^^^
 >addUndefined2 : number | undefined
 >              : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 function g(addUndefined = "J", addDefined: number) {
 >g : (addUndefined: string | undefined, addDefined: number) => number
@@ -68,24 +68,24 @@ let total = f() + f('a', 1) + f('b') + f(undefined, 2);
 >          : ^^^^^^
 >f : (addUndefined1?: string, addUndefined2?: number) => number
 >  : ^             ^^^^^^^^^^^             ^^^      ^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>1 : 1
+>  : ^
 >f('b') : number
 >       : ^^^^^^
 >f : (addUndefined1?: string, addUndefined2?: number) => number
 >  : ^             ^^^^^^^^^^^             ^^^      ^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >f(undefined, 2) : number
 >                : ^^^^^^
 >f : (addUndefined1?: string, addUndefined2?: number) => number
 >  : ^             ^^^^^^^^^^^             ^^^      ^^^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 total = g('c', 3) + g(undefined, 4);
 >total = g('c', 3) + g(undefined, 4) : number
@@ -98,26 +98,26 @@ total = g('c', 3) + g(undefined, 4);
 >          : ^^^^^^
 >g : (addUndefined: string | undefined, addDefined: number) => number
 >  : ^            ^^^^^^^^^^^^^^^^^^^^^^          ^^      ^^^^^^^^^^^
->'c' : string
->    : ^^^^^^
->3 : number
->  : ^^^^^^
+>'c' : "c"
+>    : ^^^
+>3 : 3
+>  : ^
 >g(undefined, 4) : number
 >                : ^^^^^^
 >g : (addUndefined: string | undefined, addDefined: number) => number
 >  : ^            ^^^^^^^^^^^^^^^^^^^^^^          ^^      ^^^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 function foo1(x: string = "string", b: number) {
 >foo1 : (x: string | undefined, b: number) => void
 >     : ^ ^^      ^^^^^^^^^^^^^^ ^^      ^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >b : number
 >  : ^^^^^^
 
@@ -154,8 +154,8 @@ function foo3(x: string | undefined = "string", b: number) {
 >     : ^ ^^                  ^^ ^^      ^^^^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >b : number
 >  : ^^^^^^
 
@@ -208,8 +208,8 @@ function allowsNull(val: OptionalNullableString = "") {
 >           : ^   ^^^                      ^^^^^^^^^
 >val : OptionalNullableString
 >    : ^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     val = null;
 >val = null : null
@@ -218,12 +218,12 @@ function allowsNull(val: OptionalNullableString = "") {
 >    : ^^^^^^^^^^^^^^^^^^^^^^
 
     val = 'string and null are both ok';
->val = 'string and null are both ok' : string
->                                    : ^^^^^^
+>val = 'string and null are both ok' : "string and null are both ok"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >val : OptionalNullableString
 >    : ^^^^^^^^^^^^^^^^^^^^^^
->'string and null are both ok' : string
->                              : ^^^^^^
+>'string and null are both ok' : "string and null are both ok"
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
 allowsNull(null); // still allows passing null
 >allowsNull(null) : void
@@ -241,8 +241,8 @@ foo1(undefined, 1);
 >     : ^ ^^      ^^^^^^^^^^^^^^ ^^      ^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo2(undefined, 1);
 >foo2(undefined, 1) : void
@@ -251,8 +251,8 @@ foo2(undefined, 1);
 >     : ^ ^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo3(undefined, 1);
 >foo3(undefined, 1) : void
@@ -261,8 +261,8 @@ foo3(undefined, 1);
 >     : ^ ^^                  ^^ ^^      ^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 foo4(undefined, 1);
 >foo4(undefined, 1) : void
@@ -271,8 +271,8 @@ foo4(undefined, 1);
 >     : ^ ^^                  ^^ ^^      ^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
 function removeUndefinedButNotFalse(x = true) {
diff --git a/tests/baselines/reference/defaultValueInFunctionOverload1.types b/tests/baselines/reference/defaultValueInFunctionOverload1.types
index 4b77744dd0a..849f977b154 100644
--- a/tests/baselines/reference/defaultValueInFunctionOverload1.types
+++ b/tests/baselines/reference/defaultValueInFunctionOverload1.types
@@ -6,8 +6,8 @@ function foo(x: string = '');
 >    : ^ ^^^      ^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 function foo(x = '') { }
 >foo : (x?: string) => any
diff --git a/tests/baselines/reference/defaultValueInFunctionTypes.types b/tests/baselines/reference/defaultValueInFunctionTypes.types
index 9dc3990ffe1..3729d0a95b9 100644
--- a/tests/baselines/reference/defaultValueInFunctionTypes.types
+++ b/tests/baselines/reference/defaultValueInFunctionTypes.types
@@ -6,8 +6,8 @@ type Foo = ({ first = 0 }: { first?: number }) => unknown;
 >    : ^^^
 >first : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >first : number
 >      : ^^^^^^
 
@@ -16,8 +16,8 @@ var x: (a: number = 1) => number;
 >  : ^ ^^^      ^^^^^      
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var y = <(a : string = "") => any>(undefined)
 >y : (a?: string) => any
@@ -26,8 +26,8 @@ var y = <(a : string = "") => any>(undefined)
 >                                      : ^ ^^^      ^^^^^   
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >(undefined) : undefined
 >            : ^^^^^^^^^
 >undefined : undefined
diff --git a/tests/baselines/reference/definiteAssignmentAssertions.types b/tests/baselines/reference/definiteAssignmentAssertions.types
index d0be20b1a3a..13b23a6466c 100644
--- a/tests/baselines/reference/definiteAssignmentAssertions.types
+++ b/tests/baselines/reference/definiteAssignmentAssertions.types
@@ -54,8 +54,8 @@ class C3 {
     b!: number = 1;
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     static c!: number;
 >c : number
@@ -163,12 +163,12 @@ function f3() {
 >                           : ^^^^^^^^^^
 
         x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
     g();
 >g() : void
@@ -202,8 +202,8 @@ function f4() {
     let c!: number = 1;
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 // Definite assignment assertion not permitted in ambient context
diff --git a/tests/baselines/reference/definiteAssignmentAssertionsWithObjectShortHand.types b/tests/baselines/reference/definiteAssignmentAssertionsWithObjectShortHand.types
index 089510e676f..0a42b3fd5c9 100644
--- a/tests/baselines/reference/definiteAssignmentAssertionsWithObjectShortHand.types
+++ b/tests/baselines/reference/definiteAssignmentAssertionsWithObjectShortHand.types
@@ -4,8 +4,8 @@
 const a: string | undefined = 'ff';
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'ff' : string
->     : ^^^^^^
+>'ff' : "ff"
+>     : ^^^^
 
 const foo = { a! }
 >foo : { a: string; }
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types
index 64c31cd3445..a2379e7568d 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.types
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types
index 04ae4dcada6..e9c54756f44 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.types
+++ b/tests/baselines/reference/deleteOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -203,8 +203,8 @@ var ResultIsBoolean12 = delete STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // multiple delete  operator
 var ResultIsBoolean13 = delete delete STRING;
diff --git a/tests/baselines/reference/deleteReadonly.types b/tests/baselines/reference/deleteReadonly.types
index 0ada4f8edb7..9872aeb3d00 100644
--- a/tests/baselines/reference/deleteReadonly.types
+++ b/tests/baselines/reference/deleteReadonly.types
@@ -45,7 +45,7 @@ var b: B = {
   'test': 'test'
 >'test' : string
 >       : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 };
diff --git a/tests/baselines/reference/dependentDestructuredVariables.types b/tests/baselines/reference/dependentDestructuredVariables.types
index 5e888e2fc59..52e4690a91f 100644
--- a/tests/baselines/reference/dependentDestructuredVariables.types
+++ b/tests/baselines/reference/dependentDestructuredVariables.types
@@ -979,8 +979,8 @@ readFile('hello', (err, data) => {
 >                                                                                                                        : ^^^^
 >readFile : (path: string, callback: (...args: [err: null, data: unknown[]] | [err: Error, data: undefined]) => void) => void
 >         : ^    ^^      ^^        ^^                                                                               ^^^^^    
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >(err, data) => {    if (err === null) {        data.length;    }    else {        err.message;    }} : (err: Error | null, data: unknown[] | undefined) => void
 >                                                                                                     : ^   ^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >err : Error | null
@@ -1117,12 +1117,12 @@ reducer("add", { a: 1, b: 3 });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 reducer("concat", { firstArr: [1, 2], secondArr: [3, 4] });
 >reducer("concat", { firstArr: [1, 2], secondArr: [3, 4] }) : void
@@ -1200,8 +1200,8 @@ let fooM: FooMethod = {
 >        : ^^^^
 >cb : (e: number) => void
 >   : ^ ^^      ^^^^^    
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     } else {
       cb("abc")
@@ -1209,8 +1209,8 @@ let fooM: FooMethod = {
 >          : ^^^^
 >cb : (e: string) => void
 >   : ^ ^^      ^^^^^    
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
     }
   }
 };
@@ -1263,8 +1263,8 @@ let fooAsyncM: FooAsyncMethod = {
 >        : ^^^^
 >cb : (e: number) => void
 >   : ^ ^^      ^^^^^    
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     } else {
       cb("abc")
@@ -1272,8 +1272,8 @@ let fooAsyncM: FooAsyncMethod = {
 >          : ^^^^
 >cb : (e: string) => void
 >   : ^ ^^      ^^^^^    
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
     }
   }
 };
@@ -1326,8 +1326,8 @@ let fooGenM: FooGenMethod = {
 >        : ^^^^
 >cb : (e: number) => void
 >   : ^ ^^      ^^^^^    
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     } else {
       cb("abc")
@@ -1335,8 +1335,8 @@ let fooGenM: FooGenMethod = {
 >          : ^^^^
 >cb : (e: string) => void
 >   : ^ ^^      ^^^^^    
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
     }
   }
 };
@@ -1389,8 +1389,8 @@ let fooAsyncGenM: FooAsyncGenMethod = {
 >        : ^^^^
 >cb : (e: number) => void
 >   : ^ ^^      ^^^^^    
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     } else {
       cb("abc")
@@ -1398,8 +1398,8 @@ let fooAsyncGenM: FooAsyncGenMethod = {
 >          : ^^^^
 >cb : (e: string) => void
 >   : ^ ^^      ^^^^^    
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
     }
   }
 };
diff --git a/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types b/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types
index 2ddc31d4d33..f3e90d08edc 100644
--- a/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types
+++ b/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types
@@ -168,8 +168,8 @@ async function test3() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >Promise.reject(1) : Promise<never>
 >                  : ^^^^^^^^^^^^^^
 >Promise.reject : <T = never>(reason?: any) => Promise<T>
diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.types b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.types
index f88f1992855..7c5eebffee2 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.types
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.types
@@ -36,8 +36,8 @@ class C {
 >    : ^^^^^^^^^^^^
 
                 return "well this looks kinda C-ish.";
->"well this looks kinda C-ish." : string
->                               : ^^^^^^
+>"well this looks kinda C-ish." : "well this looks kinda C-ish."
+>                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
         }
     }
@@ -96,8 +96,8 @@ class D extends C {
                 cProp: 1,
 >cProp : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
                 dProp: () => this,
 >dProp : () => this
@@ -110,8 +110,8 @@ class D extends C {
                 foo() { return "You win!!!!!" }
 >foo : () => string
 >    : ^^^^^^^^^^^^
->"You win!!!!!" : string
->               : ^^^^^^
+>"You win!!!!!" : "You win!!!!!"
+>               : ^^^^^^^^^^^^^^
 
             };
         }
diff --git a/tests/baselines/reference/derivedClassIncludesInheritedMembers.types b/tests/baselines/reference/derivedClassIncludesInheritedMembers.types
index cb00e6e9c1c..b21f58967d4 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.types
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.types
@@ -99,16 +99,16 @@ var r3 = d.c;
 >  : ^^^^^^
 
 d.c = '';
->d.c = '' : string
->         : ^^^^^^
+>d.c = '' : ""
+>         : ^^
 >d.c : string
 >    : ^^^^^^
 >d : Derived
 >  : ^^^^^^^
 >c : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r4 = Derived.r;
 >r4 : string
@@ -143,16 +143,16 @@ var r6 = Derived.t;
 >  : ^^^^^^
 
 Derived.t = '';
->Derived.t = '' : string
->               : ^^^^^^
+>Derived.t = '' : ""
+>               : ^^
 >Derived.t : string
 >          : ^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
 >t : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 class Base2 {
 >Base2 : Base2
diff --git a/tests/baselines/reference/derivedClassParameterProperties.types b/tests/baselines/reference/derivedClassParameterProperties.types
index babfccd5b2c..45367e1c1cf 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.types
+++ b/tests/baselines/reference/derivedClassParameterProperties.types
@@ -159,16 +159,16 @@ class Derived6 extends Base {
 >  : ^^^^^^
 
         this.a = 1;
->this.a = 1 : number
->           : ^^^^^^
+>this.a = 1 : 1
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         var b = 2;
 >b : number
@@ -205,28 +205,28 @@ class Derived7 extends Base {
 >  : ^^^^^^
 
         this.a = 3;
->this.a = 3 : number
->           : ^^^^^^
+>this.a = 3 : 3
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         this.b = 3;
->this.b = 3 : number
->           : ^^^^^^
+>this.b = 3 : 3
+>           : ^
 >this.b : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super();
 >super() : void
@@ -263,28 +263,28 @@ class Derived8 extends Base {
 >      : ^^^^^^^^^^^
 
         this.a = 3;
->this.a = 3 : number
->           : ^^^^^^
+>this.a = 3 : 3
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         this.b = 3;        
->this.b = 3 : number
->           : ^^^^^^
+>this.b = 3 : 3
+>           : ^
 >this.b : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 }
 
@@ -316,28 +316,28 @@ class Derived9<T> extends Base2<T> {
 >  : ^^^^^^
 
         this.a = 3;
->this.a = 3 : number
->           : ^^^^^^
+>this.a = 3 : 3
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         this.b = 3;
->this.b = 3 : number
->           : ^^^^^^
+>this.b = 3 : 3
+>           : ^
 >this.b : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super();
 >super() : void
@@ -374,27 +374,27 @@ class Derived10<T> extends Base2<T> {
 >      : ^^^^^^^^^^^^
 
         this.a = 3;
->this.a = 3 : number
->           : ^^^^^^
+>this.a = 3 : 3
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         this.b = 3;
->this.b = 3 : number
->           : ^^^^^^
+>this.b = 3 : 3
+>           : ^
 >this.b : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/derivedClassTransitivity.types b/tests/baselines/reference/derivedClassTransitivity.types
index f7448b964ed..b3547691f46 100644
--- a/tests/baselines/reference/derivedClassTransitivity.types
+++ b/tests/baselines/reference/derivedClassTransitivity.types
@@ -69,8 +69,8 @@ var r = c.foo(1);
 >  : ^
 >foo : (x: number) => void
 >    : ^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r2 = e.foo('');
 >r2 : void
@@ -83,6 +83,6 @@ var r2 = e.foo('');
 >  : ^
 >foo : (x?: string) => void
 >    : ^ ^^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/derivedClassTransitivity2.types b/tests/baselines/reference/derivedClassTransitivity2.types
index b8f97160330..7dfd5821fd0 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.types
+++ b/tests/baselines/reference/derivedClassTransitivity2.types
@@ -75,10 +75,10 @@ var r = c.foo(1, 1);
 >  : ^
 >foo : (x: number, y: number) => void
 >    : ^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
 var r2 = e.foo(1, '');
 >r2 : void
@@ -91,8 +91,8 @@ var r2 = e.foo(1, '');
 >  : ^
 >foo : (x: number, y?: string) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/derivedClassTransitivity3.types b/tests/baselines/reference/derivedClassTransitivity3.types
index 4e5be36f661..9ed86c2517e 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.types
+++ b/tests/baselines/reference/derivedClassTransitivity3.types
@@ -75,10 +75,10 @@ var r = c.foo('', '');
 >  : ^^^^^^^^^
 >foo : (x: string, y: string) => void
 >    : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 var r2 = e.foo('', 1);
 >r2 : void
@@ -91,8 +91,8 @@ var r2 = e.foo('', 1);
 >  : ^^^^^^^^^
 >foo : (x: string, y?: number) => void
 >    : ^ ^^^^^^^^^^ ^^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/derivedClassTransitivity4.types b/tests/baselines/reference/derivedClassTransitivity4.types
index f68eb0aa504..e99a76ced92 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.types
+++ b/tests/baselines/reference/derivedClassTransitivity4.types
@@ -69,8 +69,8 @@ var r = c.foo(1);
 >  : ^
 >foo : (x: number) => void
 >    : ^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r2 = e.foo('');
 >r2 : void
@@ -83,6 +83,6 @@ var r2 = e.foo('');
 >  : ^
 >foo : (x?: string) => void
 >    : ^ ^^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/derivedClassWithAny.types b/tests/baselines/reference/derivedClassWithAny.types
index a4d9ef59914..ce6bd848ddc 100644
--- a/tests/baselines/reference/derivedClassWithAny.types
+++ b/tests/baselines/reference/derivedClassWithAny.types
@@ -12,16 +12,16 @@ class C {
     get X(): number { return 1; }
 >X : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     foo(): number {
 >foo : () => number
 >    : ^^^^^^      
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     static y: number;
@@ -33,16 +33,16 @@ class C {
 >  : ^^^^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
     static bar(): number {
 >bar : () => number
 >    : ^^^^^^      
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -103,16 +103,16 @@ class E extends D {
     get X(): string{ return ''; }
 >X : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     foo(): string {
 >foo : () => string
 >    : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     static y: string;
@@ -124,16 +124,16 @@ class E extends D {
 >  : ^^^^^^
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
     static bar(): string {
 >bar : () => string
 >    : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.types b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.types
index 39a0c906f6b..53d53c52e00 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.types
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.types
@@ -14,8 +14,8 @@ class Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     protected get a() { return 1; }
@@ -47,8 +47,8 @@ class Derived extends Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     private get a() { return 1; }
diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.types b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.types
index feac44e0761..f3e9e258671 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.types
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.types
@@ -14,8 +14,8 @@ class Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     public get a() { return 1; }
@@ -47,8 +47,8 @@ class Derived extends Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     private get a() { return 1; }
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.types b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.types
index 2298d161496..bc7c83ca8fe 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.types
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.types
@@ -14,8 +14,8 @@ class Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     protected static get a() { return 1; }
@@ -47,8 +47,8 @@ class Derived extends Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     private static get a() { return 1; }
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.types b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.types
index 6d4aab1911d..003ed93176c 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.types
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.types
@@ -14,8 +14,8 @@ class Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     public static get a() { return 1; }
@@ -48,8 +48,8 @@ class Derived extends Base {
 >   : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 
     private static get a() { return 1; }
@@ -120,16 +120,16 @@ var r5 = Base.a; // ok
 >  : ^^^^^^
 
 Base.a = 2; // ok
->Base.a = 2 : number
->           : ^^^^^^
+>Base.a = 2 : 2
+>           : ^
 >Base.a : number
 >       : ^^^^^^
 >Base : typeof Base
 >     : ^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var r6 = Derived.a; // error
 >r6 : number
@@ -142,14 +142,14 @@ var r6 = Derived.a; // error
 >  : ^^^^^^
 
 Derived.a = 2; // error
->Derived.a = 2 : number
->              : ^^^^^^
+>Derived.a = 2 : 2
+>              : ^
 >Derived.a : number
 >          : ^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types
index e286a95887c..bd238860bcd 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types
@@ -60,8 +60,8 @@ var r2 = new Derived(1);
 >               : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class Base2<T> {
 >Base2 : Base2<T>
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types
index bb3a1d36211..1929d510281 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types
@@ -74,8 +74,8 @@ var r2 = new Derived(1);
 >               : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r3 = new Derived(1, 2);
 >r3 : Derived
@@ -84,10 +84,10 @@ var r3 = new Derived(1, 2);
 >                  : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var r4 = new Derived(1, 2, 3);
 >r4 : Derived
@@ -96,12 +96,12 @@ var r4 = new Derived(1, 2, 3);
 >                     : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 class Base2<T> {
 >Base2 : Base2<T>
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types
index 3aa362b88ad..35fecda6584 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types
@@ -51,8 +51,8 @@ class Derived extends Base {
 >         : ^^^^
 >super : typeof Base
 >      : ^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         this.b = y;
 >this.b = y : string
@@ -102,8 +102,8 @@ var r2 = new Derived2(1); // error
 >                : ^^^^^^^^
 >Derived2 : typeof Derived2
 >         : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r3 = new Derived('', '');
 >r3 : Derived
@@ -112,10 +112,10 @@ var r3 = new Derived('', '');
 >                    : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 class Base2<T> {
 >Base2 : Base2<T>
@@ -161,8 +161,8 @@ class D<T> extends Base {
 >         : ^^^^
 >super : typeof Base
 >      : ^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         this.b = y;
 >this.b = y : T
diff --git a/tests/baselines/reference/derivedInterfaceCallSignature.types b/tests/baselines/reference/derivedInterfaceCallSignature.types
index 10db76f5246..ab1cf1b00c3 100644
--- a/tests/baselines/reference/derivedInterfaceCallSignature.types
+++ b/tests/baselines/reference/derivedInterfaceCallSignature.types
@@ -148,8 +148,8 @@ area.interpolate('two')('one');
 >     : ^^^^^^^^^
 >interpolate : (interpolator: string) => D3SvgArea
 >            : ^            ^^      ^^^^^         
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 >'one' : "one"
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types
index 80fc84ad5a2..23957ac2007 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types
@@ -61,8 +61,8 @@ class Derived extends Base {
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         var r2 = super.foo({ a: 1, b: 2 }); // { a: number }
 >r2 : { a: number; }
@@ -79,8 +79,8 @@ class Derived extends Base {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
 >2 : 2
@@ -101,11 +101,11 @@ class Derived extends Base {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/destructureOptionalParameter.types b/tests/baselines/reference/destructureOptionalParameter.types
index 39c45648fe8..25eb04eca44 100644
--- a/tests/baselines/reference/destructureOptionalParameter.types
+++ b/tests/baselines/reference/destructureOptionalParameter.types
@@ -28,12 +28,12 @@ function f2({ a, b }: { a: number, b: number } = { a: 0, b: 0 }) {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     a;
 >a : number
diff --git a/tests/baselines/reference/destructureTupleWithVariableElement.types b/tests/baselines/reference/destructureTupleWithVariableElement.types
index 2bb78e20d4f..c64be371346 100644
--- a/tests/baselines/reference/destructureTupleWithVariableElement.types
+++ b/tests/baselines/reference/destructureTupleWithVariableElement.types
@@ -12,10 +12,10 @@ const strings: NonEmptyStringArray = ['one', 'two']
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >['one', 'two'] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->'one' : string
->      : ^^^^^^
->'two' : string
->      : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
+>'two' : "two"
+>      : ^^^^^
 
 const [s0, s1, s2] = strings;
 >s0 : string
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.types
index 2bd6b9722f7..bb892bea5bb 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.types
@@ -72,12 +72,12 @@ var [b3, b4, b5]: [number, number, string] = [1, 2, "string"];
 >   : ^^^^^^
 >[1, 2, "string"] : [number, number, string]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 function foo() {
 >foo : () => number[]
@@ -172,8 +172,8 @@ var [[c5], c6]: [[string|number], boolean] = [[1], true];
 >            : ^^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.types
index 4469704a20a..ac6da3dbca9 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.types
@@ -72,12 +72,12 @@ var [b3, b4, b5]: [number, number, string] = [1, 2, "string"];
 >   : ^^^^^^
 >[1, 2, "string"] : [number, number, string]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 function foo() {
 >foo : () => number[]
@@ -172,8 +172,8 @@ var [[c5], c6]: [[string|number], boolean] = [[1], true];
 >            : ^^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES6.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES6.types
index 4b253b0208e..20f0d124ce0 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES6.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES6.types
@@ -72,12 +72,12 @@ var [b3, b4, b5]: [number, number, string] = [1, 2, "string"];
 >   : ^^^^^^
 >[1, 2, "string"] : [number, number, string]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 function foo() {
 >foo : () => number[]
@@ -172,8 +172,8 @@ var [[c5], c6]: [[string|number], boolean] = [[1], true];
 >            : ^^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
index e030a6a5a8a..ad8ab164320 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
@@ -31,12 +31,12 @@ var [b0, b1, b2]: [number, boolean, string] = [1, 2, "string"];  // Error
 >   : ^^^^^^
 >[1, 2, "string"] : [number, number, string]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 interface J extends Array<Number> {
     2: number;
@@ -53,12 +53,12 @@ function bar(): J {
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 }
 var [b3 = "string", b4, b5] = bar();  // Error
 >b3 : string | Number
@@ -146,6 +146,6 @@ var [c4, c5, c6] = foo(1);  // Error
 >       : ^
 >foo : (idx: number) => F
 >    : ^   ^^      ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment3.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment3.types
index 1d71f8b29ed..20866fba043 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment3.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment3.types
@@ -66,8 +66,8 @@ const [f, g = f, h = i, i = f] = [1]; // error for h = i
 })([1]);
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 (function ([c, d = c, e = e]) { // error for e = e
 >(function ([c, d = c, e = e]) { // error for e = e})([1]) : void
@@ -90,8 +90,8 @@ const [f, g = f, h = i, i = f] = [1]; // error for h = i
 })([1]);
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 (function ([f, g = f, h = i, i = f]) { // error for h = i
 >(function ([f, g = f, h = i, i = f]) { // error for h = i})([1]) : void
@@ -118,6 +118,6 @@ const [f, g = f, h = i, i = f] = [1]; // error for h = i
 })([1])
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment5SiblingInitializer.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment5SiblingInitializer.types
index fdbdffbb104..f97afc115f4 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment5SiblingInitializer.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment5SiblingInitializer.types
@@ -85,8 +85,8 @@ function f3() {
 >          : ^^^^^^^^^^^^^^^^
 >'hi' : "hi"
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     const [a2, b2 = a2 + '!'] = ['hi', 1];
 >a2 : string
@@ -103,8 +103,8 @@ function f3() {
 >          : ^^^^^^^^^^^^^^^^
 >'hi' : "hi"
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 // Based on comment:
diff --git a/tests/baselines/reference/destructuringAssignabilityCheck.types b/tests/baselines/reference/destructuringAssignabilityCheck.types
index df4406a7b84..68869e33dd5 100644
--- a/tests/baselines/reference/destructuringAssignabilityCheck.types
+++ b/tests/baselines/reference/destructuringAssignabilityCheck.types
@@ -51,8 +51,8 @@ function bar([]: {}) {
 }
 
 const { }: undefined = 1
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const []: {} = {}
 >{} : {}
diff --git a/tests/baselines/reference/destructuringAssignmentWithDefault2.types b/tests/baselines/reference/destructuringAssignmentWithDefault2.types
index 3daec564378..864ec12dff5 100644
--- a/tests/baselines/reference/destructuringAssignmentWithDefault2.types
+++ b/tests/baselines/reference/destructuringAssignmentWithDefault2.types
@@ -39,12 +39,12 @@ let x: number;
 >            : ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >a : { x?: number; y?: number; }
 >  : ^^^^^^      ^^^^^^      ^^^
 
@@ -57,12 +57,12 @@ let x: number;
 >            : ^^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->x = 0 : number
->      : ^^^^^^
+>x = 0 : 0
+>      : ^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >a : { x?: number; y?: number; }
 >  : ^^^^^^      ^^^^^^      ^^^
 
@@ -130,8 +130,8 @@ const { x: z2 = 0 } = a;
 >  : ^^^
 >z2 : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >a : { x?: number; y?: number; }
 >  : ^^^^^^      ^^^^^^      ^^^
 
diff --git a/tests/baselines/reference/destructuringControlFlow.types b/tests/baselines/reference/destructuringControlFlow.types
index 643c36199e3..053f79fdf65 100644
--- a/tests/baselines/reference/destructuringControlFlow.types
+++ b/tests/baselines/reference/destructuringControlFlow.types
@@ -275,8 +275,8 @@ let [key, value]: KeyValue = ["foo"];
 >      : ^^^^^^^^^^^^^^^^^^
 >["foo"] : [string]
 >        : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 value.toUpperCase();  // Error
 >value.toUpperCase() : any
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
index 8b0821379bd..b91838a7a77 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
@@ -40,8 +40,8 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 >                  : ^^^^^^^^^^^^^^^^
 >b21 : string
 >    : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >{ b2: { b21: "world" } } : { b2?: { b21: string; }; }
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >b2 : { b21: string; }
@@ -50,8 +50,8 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 >                 : ^^^^^^^^^^^^^^^^
 >b21 : string
 >    : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 var {1: b3} = { 1: "string" };
 >b3 : string
@@ -167,8 +167,8 @@ function foo1(): F1 {
         "prop1": 2
 >"prop1" : number
 >        : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
index a1fd03edfc2..3bfae7da8a7 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
@@ -40,8 +40,8 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 >                  : ^^^^^^^^^^^^^^^^
 >b21 : string
 >    : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >{ b2: { b21: "world" } } : { b2?: { b21: string; }; }
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >b2 : { b21: string; }
@@ -50,8 +50,8 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 >                 : ^^^^^^^^^^^^^^^^
 >b21 : string
 >    : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 var {1: b3} = { 1: "string" };
 >b3 : string
@@ -167,8 +167,8 @@ function foo1(): F1 {
         "prop1": 2
 >"prop1" : number
 >        : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment9SiblingInitializer.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment9SiblingInitializer.types
index e1f97427e40..5d8a6dcf495 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment9SiblingInitializer.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment9SiblingInitializer.types
@@ -97,8 +97,8 @@ function f3() {
 >     : ^^^^
 >b1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     const { a2, b2 = a2 + '!' } = { a2: 'hi', b2: 1 };
 >a2 : string
@@ -119,8 +119,8 @@ function f3() {
 >     : ^^^^
 >b2 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 // Based on comment:
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5.types b/tests/baselines/reference/destructuringParameterDeclaration1ES5.types
index 3a8796f019c..bf29ab287a4 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5.types
@@ -79,16 +79,16 @@ a1([1, 2, [["world"]]]);
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]]] : [number, number, string[][]]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 a1([1, 2, [["world"]], 3]);
 >a1([1, 2, [["world"]], 3]) : void
@@ -97,16 +97,16 @@ a1([1, 2, [["world"]], 3]);
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]], 3] : [number, number, string[][], number]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 >3 : 3
 >  : ^
 
@@ -265,8 +265,8 @@ b2("string", { x: 200, y: "string" });
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->200 : number
->    : ^^^^^^
+>200 : 200
+>    : ^^^
 >y : string
 >  : ^^^^^^
 >"string" : "string"
@@ -283,8 +283,8 @@ b2("string", { x: 200, y: true });
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->200 : number
->    : ^^^^^^
+>200 : 200
+>    : ^^^
 >y : boolean
 >  : ^^^^^^^
 >true : true
@@ -377,8 +377,8 @@ function c3({b}: { b: number|string} = { b: "hello" }) { }
 >               : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 function c5([a, b, [[c]]]) { }
 >c5 : ([a, b, [[c]]]: [any, any, [[any]]]) => void
@@ -465,8 +465,8 @@ c1({ z: 1 })      // Implied type is {z:number}?
 >         : ^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c2({});         // Implied type is {z?: number}
 >c2({}) : void
@@ -485,8 +485,8 @@ c2({z:1});      // Implied type is {z?: number}
 >      : ^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c3({ b: 1 });     // Implied type is { b: number|string }.
 >c3({ b: 1 }) : void
@@ -497,8 +497,8 @@ c3({ b: 1 });     // Implied type is { b: number|string }.
 >         : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c5([1, 2, [["string"]]]);               // Implied type is is [any, any, [[any]]]
 >c5([1, 2, [["string"]]]) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types b/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types
index 18acc8073ab..b8dc9594ee0 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types
@@ -79,16 +79,16 @@ a1([1, 2, [["world"]]]);
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]]] : [number, number, string[][]]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 a1([1, 2, [["world"]], 3]);
 >a1([1, 2, [["world"]], 3]) : void
@@ -97,16 +97,16 @@ a1([1, 2, [["world"]], 3]);
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]], 3] : [number, number, string[][], number]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 >3 : 3
 >  : ^
 
@@ -265,8 +265,8 @@ b2("string", { x: 200, y: "string" });
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->200 : number
->    : ^^^^^^
+>200 : 200
+>    : ^^^
 >y : string
 >  : ^^^^^^
 >"string" : "string"
@@ -283,8 +283,8 @@ b2("string", { x: 200, y: true });
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->200 : number
->    : ^^^^^^
+>200 : 200
+>    : ^^^
 >y : boolean
 >  : ^^^^^^^
 >true : true
@@ -377,8 +377,8 @@ function c3({b}: { b: number|string} = { b: "hello" }) { }
 >               : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 function c5([a, b, [[c]]]) { }
 >c5 : ([a, b, [[c]]]: [any, any, [[any]]]) => void
@@ -465,8 +465,8 @@ c1({ z: 1 })      // Implied type is {z:number}?
 >         : ^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c2({});         // Implied type is {z?: number}
 >c2({}) : void
@@ -485,8 +485,8 @@ c2({z:1});      // Implied type is {z?: number}
 >      : ^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c3({ b: 1 });     // Implied type is { b: number|string }.
 >c3({ b: 1 }) : void
@@ -497,8 +497,8 @@ c3({ b: 1 });     // Implied type is { b: number|string }.
 >         : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c5([1, 2, [["string"]]]);               // Implied type is is [any, any, [[any]]]
 >c5([1, 2, [["string"]]]) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES6.types b/tests/baselines/reference/destructuringParameterDeclaration1ES6.types
index a9b0204c0e2..8bc4d49e6cf 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES6.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES6.types
@@ -81,16 +81,16 @@ a1([1, 2, [["world"]]]);
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]]] : [number, number, string[][]]
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 a1([1, 2, [["world"]], 3]);
 >a1([1, 2, [["world"]], 3]) : void
@@ -99,16 +99,16 @@ a1([1, 2, [["world"]], 3]);
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]], 3] : [number, number, string[][], number]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 >3 : 3
 >  : ^
 
@@ -268,8 +268,8 @@ b2("string", { x: 200, y: "string" });
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->200 : number
->    : ^^^^^^
+>200 : 200
+>    : ^^^
 >y : string
 >  : ^^^^^^
 >"string" : "string"
@@ -286,8 +286,8 @@ b2("string", { x: 200, y: true });
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->200 : number
->    : ^^^^^^
+>200 : 200
+>    : ^^^
 >y : boolean
 >  : ^^^^^^^
 >true : true
@@ -344,8 +344,8 @@ function c3({b}: { b: number|string} = { b: "hello" }) { }
 >               : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 function c5([a, b, [[c]]]) { }
 >c5 : ([a, b, [[c]]]: [any, any, [[any]]]) => void
@@ -432,8 +432,8 @@ c1({ z: 1 })      // Implied type is {z:number}?
 >         : ^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c2({});         // Implied type is {z?: number}
 >c2({}) : void
@@ -452,8 +452,8 @@ c2({z:1});      // Implied type is {z?: number}
 >      : ^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c3({ b: 1 });     // Implied type is { b: number|string }.
 >c3({ b: 1 }) : void
@@ -464,8 +464,8 @@ c3({ b: 1 });     // Implied type is { b: number|string }.
 >         : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c5([1, 2, [["string"]]]);               // Implied type is is [any, any, [[any]]]
 >c5([1, 2, [["string"]]]) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.types b/tests/baselines/reference/destructuringParameterDeclaration2.types
index 8752c4cc3e1..8c69c1f57e0 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.types
@@ -23,16 +23,16 @@ a0([1, "string", [["world"]]);      // Error
 >   : ^             ^^                            ^^^^^^^^^
 >[1, "string", [["world"]] : [number, string, string[][]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 a0([1, 2, [["world"]], "string"]);  // Error
 >a0([1, 2, [["world"]], "string"]) : void
@@ -41,16 +41,16 @@ a0([1, 2, [["world"]], "string"]);  // Error
 >   : ^             ^^                            ^^^^^^^^^
 >[1, 2, [["world"]], "string"] : [number, number, string[][], string]
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[["world"]] : string[][]
 >            : ^^^^^^^^^^
 >["world"] : string[]
 >          : ^^^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 >"string" : "string"
 >         : ^^^^^^^^
 
@@ -166,8 +166,8 @@ b1("string", { x: "string", y: true });  // Error
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >y : boolean
 >  : ^^^^^^^
 >true : true
@@ -217,8 +217,8 @@ function c3({b}: { b: number|string } = { b: "hello" }) { }
 >               : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 function c4([z], z: number) { }  // Error Duplicate identifier
 >c4 : ([z]: [any], z: number) => void
@@ -337,8 +337,8 @@ c6([1, 2, [["string"]]]);  // Error, implied type is [any, any, [[number]]]  //
 >             : ^^^^^^^^^^
 >["string"] : [string]
 >           : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // A parameter can be marked optional by following its name or binding pattern with a question mark (?)
 // or by including an initializer.  Initializers (including binding property or element initializers) are
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.types b/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
index 209013f1586..91660ffb32e 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
@@ -211,10 +211,10 @@ a11([1, 2]);                              // Parameter type is number[]
 >    : ^               ^^        ^^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // Rest parameter with generic
 function foo<T>(...a: T[]) { }
@@ -228,22 +228,22 @@ foo<number|string>("hello", 1, 2);
 >                                  : ^^^^
 >foo : <T>(...a: T[]) => void
 >    : ^ ^^^^^ ^^   ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 foo("hello", "world");
 >foo("hello", "world") : void
 >                      : ^^^^
 >foo : <T>(...a: T[]) => void
 >    : ^ ^^^^^ ^^   ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 enum E { a, b }
 >E : E
@@ -272,12 +272,12 @@ foo1(1, 2, 3, E.a);
 >                   : ^^^^
 >foo1 : <T extends Number>(...a: T[]) => void
 >     : ^ ^^^^^^^^^      ^^^^^ ^^   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >E.a : E.a
 >    : ^^^
 >E : typeof E
@@ -290,12 +290,12 @@ foo1(1, 2, 3, E1.a, E.b);
 >                         : ^^^^
 >foo1 : <T extends Number>(...a: T[]) => void
 >     : ^ ^^^^^^^^^      ^^^^^ ^^   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >E1.a : E1.a
 >     : ^^^^
 >E1 : typeof E1
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types
index 855ff4a35f8..64c5edb5740 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types
@@ -211,10 +211,10 @@ a11([1, 2]);                              // Parameter type is number[]
 >    : ^               ^^        ^^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // Rest parameter with generic
 function foo<T>(...a: T[]) { }
@@ -228,22 +228,22 @@ foo<number|string>("hello", 1, 2);
 >                                  : ^^^^
 >foo : <T>(...a: T[]) => void
 >    : ^ ^^^^^ ^^   ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 foo("hello", "world");
 >foo("hello", "world") : void
 >                      : ^^^^
 >foo : <T>(...a: T[]) => void
 >    : ^ ^^^^^ ^^   ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 enum E { a, b }
 >E : E
@@ -272,12 +272,12 @@ foo1(1, 2, 3, E.a);
 >                   : ^^^^
 >foo1 : <T extends Number>(...a: T[]) => void
 >     : ^ ^^^^^^^^^      ^^^^^ ^^   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >E.a : E.a
 >    : ^^^
 >E : typeof E
@@ -290,12 +290,12 @@ foo1(1, 2, 3, E1.a, E.b);
 >                         : ^^^^
 >foo1 : <T extends Number>(...a: T[]) => void
 >     : ^ ^^^^^^^^^      ^^^^^ ^^   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >E1.a : E1.a
 >     : ^^^^
 >E1 : typeof E1
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.types b/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
index 72c3d2aecb7..d73d78bfbac 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
@@ -211,10 +211,10 @@ a11([1, 2]);                              // Parameter type is number[]
 >    : ^               ^^        ^^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // Rest parameter with generic
 function foo<T>(...a: T[]) { }
@@ -228,22 +228,22 @@ foo<number|string>("hello", 1, 2);
 >                                  : ^^^^
 >foo : <T>(...a: T[]) => void
 >    : ^ ^^^^^ ^^   ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 foo("hello", "world");
 >foo("hello", "world") : void
 >                      : ^^^^
 >foo : <T>(...a: T[]) => void
 >    : ^ ^^^^^ ^^   ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 enum E { a, b }
 >E : E
@@ -272,12 +272,12 @@ foo1(1, 2, 3, E.a);
 >                   : ^^^^
 >foo1 : <T extends Number>(...a: T[]) => void
 >     : ^ ^^^^^^^^^      ^^^^^ ^^   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >E.a : E.a
 >    : ^^^
 >E : typeof E
@@ -290,12 +290,12 @@ foo1(1, 2, 3, E1.a, E.b);
 >                         : ^^^^
 >foo1 : <T extends Number>(...a: T[]) => void
 >     : ^ ^^^^^^^^^      ^^^^^ ^^   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >E1.a : E1.a
 >     : ^^^^
 >E1 : typeof E1
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.types b/tests/baselines/reference/destructuringParameterDeclaration4.types
index 5d67aadf00a..da2d335a5f4 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.types
@@ -85,12 +85,12 @@ a1(1, 2, "hello", true);  // Error, parameter type is (number|string)[]
 >                        : ^^^^
 >a1 : (...x: (number | string)[]) => void
 >   : ^^^^ ^^                   ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -141,12 +141,12 @@ a6([1, 2, "string"]);                   // Error, parameter type is number[]
 >   : ^               ^^        ^^^^^^^^^
 >[1, 2, "string"] : (string | number)[]
 >                 : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 
 var temp = [1, 2, 3];
diff --git a/tests/baselines/reference/destructuringParameterProperties1.types b/tests/baselines/reference/destructuringParameterProperties1.types
index b3ae1061fdc..fdafd64edca 100644
--- a/tests/baselines/reference/destructuringParameterProperties1.types
+++ b/tests/baselines/reference/destructuringParameterProperties1.types
@@ -78,12 +78,12 @@ c1 = new C1(["larry", "{curly}", "moe"]);
 >   : ^^^^^^^^^
 >["larry", "{curly}", "moe"] : string[]
 >                            : ^^^^^^^^
->"larry" : string
->        : ^^^^^^
->"{curly}" : string
->          : ^^^^^^
->"moe" : string
->      : ^^^^^^
+>"larry" : "larry"
+>        : ^^^^^^^
+>"{curly}" : "{curly}"
+>          : ^^^^^^^^^
+>"moe" : "moe"
+>      : ^^^^^
 
 var useC1Properties = c1.x === c1.y && c1.y === c1.z;
 >useC1Properties : boolean
@@ -128,10 +128,10 @@ var c2 = new C2(["10", 10, !!10]);
 >   : ^^^^^^^^^
 >["10", 10, !!10] : [string, number, boolean]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
->"10" : string
->     : ^^^^^^
->10 : number
->   : ^^^^^^
+>"10" : "10"
+>     : ^^^^
+>10 : 10
+>   : ^^
 >!!10 : boolean
 >     : ^^^^^^^
 >!10 : boolean
@@ -178,12 +178,12 @@ var c3 = new C3({x: 0, y: "", z: false});
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >z : false
 >  : ^^^^^
 >false : false
@@ -202,12 +202,12 @@ c3 = new C3({x: 0, "y": "y", z: true});
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>0 : 0
+>  : ^
 >"y" : string
 >    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 >z : true
 >  : ^^^^
 >true : true
diff --git a/tests/baselines/reference/destructuringParameterProperties2.types b/tests/baselines/reference/destructuringParameterProperties2.types
index 3161cc20027..442d154f942 100644
--- a/tests/baselines/reference/destructuringParameterProperties2.types
+++ b/tests/baselines/reference/destructuringParameterProperties2.types
@@ -128,8 +128,8 @@ var x = new C1(undefined, [0, undefined, ""]);
 >          : ^^^^^^^^^
 >[0, undefined, ""] : [number, undefined, string]
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 >"" : ""
@@ -176,14 +176,14 @@ var y = new C1(10, [0, "", true]);
 >                          : ^^
 >C1 : typeof C1
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >[0, "", true] : [number, string, true]
 >              : ^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>0 : 0
+>  : ^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
@@ -228,14 +228,14 @@ var z = new C1(10, [undefined, "", null]);
 >                                  : ^^
 >C1 : typeof C1
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >[undefined, "", null] : [undefined, string, null]
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var [z_a, z_b, z_c] = [z.getA(), z.getB(), z.getC()];
 >z_a : any
diff --git a/tests/baselines/reference/destructuringParameterProperties3.types b/tests/baselines/reference/destructuringParameterProperties3.types
index 2a31c0259bd..3ea671d6796 100644
--- a/tests/baselines/reference/destructuringParameterProperties3.types
+++ b/tests/baselines/reference/destructuringParameterProperties3.types
@@ -128,12 +128,12 @@ var x = new C1(undefined, [0, true, ""]);
 >          : ^^^^^^^^^
 >[0, true, ""] : [number, true, string]
 >              : ^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >true : true
 >     : ^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var [x_a, x_b, x_c] = [x.getA(), x.getB(), x.getC()];
 >x_a : any
@@ -176,12 +176,12 @@ var y = new C1(10, [0, true, true]);
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >C1 : typeof C1
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >[0, true, true] : [number, true, true]
 >                : ^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >true : true
 >     : ^^^^
 >true : true
@@ -234,10 +234,10 @@ var z = new C1(10, [undefined, "", ""]);
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
 var [z_a, z_b, z_c] = [z.getA(), z.getB(), z.getC()];
 >z_a : any
diff --git a/tests/baselines/reference/destructuringParameterProperties5.types b/tests/baselines/reference/destructuringParameterProperties5.types
index ee589c4586a..bd277d8cd26 100644
--- a/tests/baselines/reference/destructuringParameterProperties5.types
+++ b/tests/baselines/reference/destructuringParameterProperties5.types
@@ -120,8 +120,8 @@ var a = new C1([{ x1: 10, x2: "", x3: true }, "", false]);
 >   : ^^^^^^^
 >true : true
 >     : ^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >false : false
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/destructuringSameNames.types b/tests/baselines/reference/destructuringSameNames.types
index 4533aee86ec..8f4a7afa80c 100644
--- a/tests/baselines/reference/destructuringSameNames.types
+++ b/tests/baselines/reference/destructuringSameNames.types
@@ -32,8 +32,8 @@ let { foo, foo: bar } = { foo: 1 };
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 ({ foo, foo: bar } = { foo: 3 });
 >({ foo, foo: bar } = { foo: 3 }) : { foo: number; }
@@ -52,8 +52,8 @@ let { foo, foo: bar } = { foo: 1 };
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 ({ foo: bar, foo } = { foo: 4 });
 >({ foo: bar, foo } = { foo: 4 }) : { foo: number; }
@@ -72,8 +72,8 @@ let { foo, foo: bar } = { foo: 1 };
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 ({ foo, bar: foo } = { foo: 3, bar: 33 });
 >({ foo, bar: foo } = { foo: 3, bar: 33 }) : { foo: number; bar: number; }
@@ -92,12 +92,12 @@ let { foo, foo: bar } = { foo: 1 };
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >bar : number
 >    : ^^^^^^
->33 : number
->   : ^^^^^^
+>33 : 33
+>   : ^^
 
 ({ bar: foo, foo } = { foo: 4, bar: 44 });
 >({ bar: foo, foo } = { foo: 4, bar: 44 }) : { foo: number; bar: number; }
@@ -116,12 +116,12 @@ let { foo, foo: bar } = { foo: 1 };
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >bar : number
 >    : ^^^^^^
->44 : number
->   : ^^^^^^
+>44 : 44
+>   : ^^
 
 ({ foo: bar, foo: bar } = { foo: 5 });
 >({ foo: bar, foo: bar } = { foo: 5 }) : { foo: number; }
@@ -142,8 +142,8 @@ let { foo, foo: bar } = { foo: 1 };
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 ({ foo: bar, bar: foo } = { foo: 6, bar: 66 });
 >({ foo: bar, bar: foo } = { foo: 6, bar: 66 }) : { foo: number; bar: number; }
@@ -164,12 +164,12 @@ let { foo, foo: bar } = { foo: 1 };
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >bar : number
 >    : ^^^^^^
->66 : number
->   : ^^^^^^
+>66 : 66
+>   : ^^
 
 ({ foo: bar, foo: bar } = { foo: 7 });
 >({ foo: bar, foo: bar } = { foo: 7 }) : { foo: number; }
@@ -190,8 +190,8 @@ let { foo, foo: bar } = { foo: 1 };
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
 [foo, foo] = [111, 1111];
 >[foo, foo] = [111, 1111] : [number, number]
@@ -204,10 +204,10 @@ let { foo, foo: bar } = { foo: 1 };
 >    : ^^^^^^
 >[111, 1111] : [number, number]
 >            : ^^^^^^^^^^^^^^^^
->111 : number
->    : ^^^^^^
->1111 : number
->     : ^^^^^^
+>111 : 111
+>    : ^^^
+>1111 : 1111
+>     : ^^^^
 
 [foo, foo] = [222, 2222];
 >[foo, foo] = [222, 2222] : [number, number]
@@ -220,10 +220,10 @@ let { foo, foo: bar } = { foo: 1 };
 >    : ^^^^^^
 >[222, 2222] : [number, number]
 >            : ^^^^^^^^^^^^^^^^
->222 : number
->    : ^^^^^^
->2222 : number
->     : ^^^^^^
+>222 : 222
+>    : ^^^
+>2222 : 2222
+>     : ^^^^
 
 [bar, foo, foo] = [333, 3333, 33333];
 >[bar, foo, foo] = [333, 3333, 33333] : [number, number, number]
@@ -238,12 +238,12 @@ let { foo, foo: bar } = { foo: 1 };
 >    : ^^^^^^
 >[333, 3333, 33333] : [number, number, number]
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^
->333 : number
->    : ^^^^^^
->3333 : number
->     : ^^^^^^
->33333 : number
->      : ^^^^^^
+>333 : 333
+>    : ^^^
+>3333 : 3333
+>     : ^^^^
+>33333 : 33333
+>      : ^^^^^
 
 [foo, bar, foo] = [333, 3333, 33333];
 >[foo, bar, foo] = [333, 3333, 33333] : [number, number, number]
@@ -258,12 +258,12 @@ let { foo, foo: bar } = { foo: 1 };
 >    : ^^^^^^
 >[333, 3333, 33333] : [number, number, number]
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^
->333 : number
->    : ^^^^^^
->3333 : number
->     : ^^^^^^
->33333 : number
->      : ^^^^^^
+>333 : 333
+>    : ^^^
+>3333 : 3333
+>     : ^^^^
+>33333 : 33333
+>      : ^^^^^
 
 [foo, foo, bar] = [444, 4444, 44444];
 >[foo, foo, bar] = [444, 4444, 44444] : [number, number, number]
@@ -278,12 +278,12 @@ let { foo, foo: bar } = { foo: 1 };
 >    : ^^^^^^
 >[444, 4444, 44444] : [number, number, number]
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^
->444 : number
->    : ^^^^^^
->4444 : number
->     : ^^^^^^
->44444 : number
->      : ^^^^^^
+>444 : 444
+>    : ^^^
+>4444 : 4444
+>     : ^^^^
+>44444 : 44444
+>      : ^^^^^
 
 // Error cases
 
diff --git a/tests/baselines/reference/destructuringTypeGuardFlow.types b/tests/baselines/reference/destructuringTypeGuardFlow.types
index 8f26173c272..1b80b443cb9 100644
--- a/tests/baselines/reference/destructuringTypeGuardFlow.types
+++ b/tests/baselines/reference/destructuringTypeGuardFlow.types
@@ -34,24 +34,24 @@ const aFoo: foo = { bar: 3, baz: "b", nested: { a: 1, b: "y" } };
 >                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : number
 >    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >baz : string
 >    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 >nested : { a: number; b: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ a: 1, b: "y" } : { a: number; b: string; }
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 
 if (aFoo.bar && aFoo.nested.b) {
 >aFoo.bar && aFoo.nested.b : string | 0 | null
diff --git a/tests/baselines/reference/destructuringUnspreadableIntoRest.types b/tests/baselines/reference/destructuringUnspreadableIntoRest.types
index d8d127de65c..cc87560aed5 100644
--- a/tests/baselines/reference/destructuringUnspreadableIntoRest.types
+++ b/tests/baselines/reference/destructuringUnspreadableIntoRest.types
@@ -25,8 +25,8 @@ class A {
 >       : ^^^^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     set setter(_v: number) {}
diff --git a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.types b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.types
index 5a6ec6635cf..fca9b511450 100644
--- a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.types
+++ b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.types
@@ -116,12 +116,12 @@ foo({
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^      ^
 
     1,
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     2,
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     getNum
 >getNum : () => number
diff --git a/tests/baselines/reference/discriminateWithMissingProperty.types b/tests/baselines/reference/discriminateWithMissingProperty.types
index 3ddab00c8cc..15fcee28aaf 100644
--- a/tests/baselines/reference/discriminateWithMissingProperty.types
+++ b/tests/baselines/reference/discriminateWithMissingProperty.types
@@ -53,6 +53,6 @@ foo({ mode: "numeric", data: new Uint8Array([30]) }); // Should error
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >[30] : number[]
 >     : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
diff --git a/tests/baselines/reference/discriminatedUnionInference.types b/tests/baselines/reference/discriminatedUnionInference.types
index 47bb659b2ef..3e57da05127 100644
--- a/tests/baselines/reference/discriminatedUnionInference.types
+++ b/tests/baselines/reference/discriminatedUnionInference.types
@@ -62,8 +62,8 @@ let x1 = foo({ kind: 'a', data: 42 });  // number
 >    : ^^^
 >data : number
 >     : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let x2 = foo({ kind: 'b', data: [1, 2] });  // number
 >x2 : number
@@ -82,8 +82,8 @@ let x2 = foo({ kind: 'b', data: [1, 2] });  // number
 >     : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/discriminatedUnionTypes2.types b/tests/baselines/reference/discriminatedUnionTypes2.types
index 497e147f418..f67c4ae4daa 100644
--- a/tests/baselines/reference/discriminatedUnionTypes2.types
+++ b/tests/baselines/reference/discriminatedUnionTypes2.types
@@ -166,8 +166,8 @@ function f13(x: { a: null; b: string } | { a: string, c: number }) {
 >  : ^^^^
 >b : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >c : number
 >  : ^^^^^^
 >4 : 4
@@ -268,8 +268,8 @@ f15({ value: 10 });
 >              : ^^^^^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 f15({ error: new Error("boom") });
 >f15({ error: new Error("boom") }) : void
@@ -284,7 +284,7 @@ f15({ error: new Error("boom") });
 >                  : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"boom" : string
+>"boom" : "boom"
 >       : ^^^^^^
 
 // Repro from #24193
diff --git a/tests/baselines/reference/dissallowSymbolAsWeakType.types b/tests/baselines/reference/dissallowSymbolAsWeakType.types
index ec43355523a..b5728d2b592 100644
--- a/tests/baselines/reference/dissallowSymbolAsWeakType.types
+++ b/tests/baselines/reference/dissallowSymbolAsWeakType.types
@@ -8,8 +8,8 @@ const s: symbol = Symbol('s');
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
 const ws = new WeakSet([s]);
 >ws : WeakSet<object>
diff --git a/tests/baselines/reference/divergentAccessors1.types b/tests/baselines/reference/divergentAccessors1.types
index ef3b10cf9b1..b5445ea0b62 100644
--- a/tests/baselines/reference/divergentAccessors1.types
+++ b/tests/baselines/reference/divergentAccessors1.types
@@ -22,16 +22,16 @@
 >null as any : any
 
     ihgs.foo = "32";
->ihgs.foo = "32" : string
->                : ^^^^^^
+>ihgs.foo = "32" : "32"
+>                : ^^^^
 >ihgs.foo : string | number
 >         : ^^^^^^^^^^^^^^^
 >ihgs : IHasGetSet
 >     : ^^^^^^^^^^
 >foo : string | number
 >    : ^^^^^^^^^^^^^^^
->"32" : string
->     : ^^^^^^
+>"32" : "32"
+>     : ^^^^
 
     let r_ihgs_foo: number = ihgs.foo;
 >r_ihgs_foo : number
@@ -66,16 +66,16 @@
 >null as any : any
 
     t_hgs.foo = "32";
->t_hgs.foo = "32" : string
->                 : ^^^^^^
+>t_hgs.foo = "32" : "32"
+>                 : ^^^^
 >t_hgs.foo : string | number
 >          : ^^^^^^^^^^^^^^^
 >t_hgs : { get foo(): number; set foo(v: number | string); }
 >      : ^^^^^^^^^^^^^      ^^^^^^^^^^ ^^               ^^^^
 >foo : string | number
 >    : ^^^^^^^^^^^^^^^
->"32" : string
->     : ^^^^^^
+>"32" : "32"
+>     : ^^^^
 
     let r_t_hgs_foo: number = t_hgs.foo;
 >r_t_hgs_foo : number
diff --git a/tests/baselines/reference/divergentAccessorsTypes1.types b/tests/baselines/reference/divergentAccessorsTypes1.types
index 8aa81db32e5..708e11eda34 100644
--- a/tests/baselines/reference/divergentAccessorsTypes1.types
+++ b/tests/baselines/reference/divergentAccessorsTypes1.types
@@ -8,8 +8,8 @@ class Test1 {
     get foo(): string { return "" }
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     set foo(s: string | number) {
 >foo : string
@@ -37,8 +37,8 @@ class Test1 {
     get bar(): string | number { return "" }
 >bar : string | number
 >    : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     set bar(s: string | number | boolean) {
 >bar : string | number
@@ -106,16 +106,16 @@ type Test3 = {
 >      : ^^^^^^^^^^^^
 
     t.foo = 32;
->t.foo = 32 : number
->           : ^^^^^^
+>t.foo = 32 : 32
+>           : ^^
 >t.foo : string | number
 >      : ^^^^^^^^^^^^^^^
 >t : Test1
 >  : ^^^^^
 >foo : string | number
 >    : ^^^^^^^^^^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
     let m: string = t.foo;
 >m : string
@@ -183,16 +183,16 @@ type Test3 = {
 >   : ^^
 
     t.foo = 32;
->t.foo = 32 : number
->           : ^^^^^^
+>t.foo = 32 : 32
+>           : ^^
 >t.foo : string | number
 >      : ^^^^^^^^^^^^^^^
 >t : Test2
 >  : ^^^^^
 >foo : string | number
 >    : ^^^^^^^^^^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
     let m: string = t.foo;
 >m : string
@@ -260,16 +260,16 @@ type Test3 = {
 >   : ^^
 
     t.foo = 32;
->t.foo = 32 : number
->           : ^^^^^^
+>t.foo = 32 : 32
+>           : ^^
 >t.foo : string | number
 >      : ^^^^^^^^^^^^^^^
 >t : Test3
 >  : ^^^^^
 >foo : string | number
 >    : ^^^^^^^^^^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
     let m: string = t.foo;
 >m : string
diff --git a/tests/baselines/reference/divergentAccessorsTypes2.types b/tests/baselines/reference/divergentAccessorsTypes2.types
index d147e9981b1..9eb790c6d2a 100644
--- a/tests/baselines/reference/divergentAccessorsTypes2.types
+++ b/tests/baselines/reference/divergentAccessorsTypes2.types
@@ -40,26 +40,26 @@ s.foo = undefined;
 >          : ^^^^^^^^^
 
 s.foo = "hello";
->s.foo = "hello" : string
->                : ^^^^^^
+>s.foo = "hello" : "hello"
+>                : ^^^^^^^
 >s.foo : string | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >s : Test1<string>
 >  : ^^^^^^^^^^^^^
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 s.foo = 42;
->s.foo = 42 : number
->           : ^^^^^^
+>s.foo = 42 : 42
+>           : ^^
 >s.foo : string | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >s : Test1<string>
 >  : ^^^^^^^^^^^^^
 >foo : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/divergentAccessorsTypes3.types b/tests/baselines/reference/divergentAccessorsTypes3.types
index 614d564f110..b8e3ed2ecd9 100644
--- a/tests/baselines/reference/divergentAccessorsTypes3.types
+++ b/tests/baselines/reference/divergentAccessorsTypes3.types
@@ -8,8 +8,8 @@ class One {
   get prop1(): string { return ""; }
 >prop1 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop1(s: string | number) { }
 >prop1 : string
@@ -20,8 +20,8 @@ class One {
   get prop2(): string { return ""; }
 >prop2 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop2(s: string | number) { }
 >prop2 : string
@@ -36,8 +36,8 @@ class One {
   get prop4(): string { return ""; }
 >prop4 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop4(s: string | number) { }
 >prop4 : string
@@ -53,8 +53,8 @@ class Two {
   get prop1(): string { return ""; }
 >prop1 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop1(s: string | number) { }
 >prop1 : string
@@ -65,8 +65,8 @@ class Two {
   get prop2(): string { return ""; }
 >prop2 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop2(s: string) { }
 >prop2 : string
@@ -77,8 +77,8 @@ class Two {
   get prop3(): string { return ""; }
 >prop3 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop3(s: string | boolean) { }
 >prop3 : string
@@ -89,8 +89,8 @@ class Two {
   get prop4(): string { return ""; }
 >prop4 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop4(s: string | boolean) { }
 >prop4 : string
@@ -104,52 +104,52 @@ declare const u1: One|Two;
 >   : ^^^^^^^^^
 
 u1.prop1 = 42;
->u1.prop1 = 42 : number
->              : ^^^^^^
+>u1.prop1 = 42 : 42
+>              : ^^
 >u1.prop1 : string | number
 >         : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >prop1 : string | number
 >      : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 u1.prop1 = "hello";
->u1.prop1 = "hello" : string
->                   : ^^^^^^
+>u1.prop1 = "hello" : "hello"
+>                   : ^^^^^^^
 >u1.prop1 : string | number
 >         : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >prop1 : string | number
 >      : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 u1.prop2 = 42;
->u1.prop2 = 42 : number
->              : ^^^^^^
+>u1.prop2 = 42 : 42
+>              : ^^
 >u1.prop2 : string | number
 >         : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >prop2 : string | number
 >      : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 u1.prop2 = "hello";
->u1.prop2 = "hello" : string
->                   : ^^^^^^
+>u1.prop2 = "hello" : "hello"
+>                   : ^^^^^^^
 >u1.prop2 : string | number
 >         : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >prop2 : string | number
 >      : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 u1.prop3 = 42;
 >u1.prop3 = 42 : 42
diff --git a/tests/baselines/reference/divergentAccessorsTypes4.types b/tests/baselines/reference/divergentAccessorsTypes4.types
index 969788ef772..3b2d673d9f1 100644
--- a/tests/baselines/reference/divergentAccessorsTypes4.types
+++ b/tests/baselines/reference/divergentAccessorsTypes4.types
@@ -8,8 +8,8 @@ class One {
   get prop1(): string { return ""; }
 >prop1 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop1(s: string | number) { }
 >prop1 : string
@@ -41,8 +41,8 @@ class Two {
   get prop2(): string { return ""; }
 >prop2 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop2(s: string | 42) { }
 >prop2 : string
diff --git a/tests/baselines/reference/divergentAccessorsTypes5.types b/tests/baselines/reference/divergentAccessorsTypes5.types
index 82d90bbfd0c..b3b386c49a8 100644
--- a/tests/baselines/reference/divergentAccessorsTypes5.types
+++ b/tests/baselines/reference/divergentAccessorsTypes5.types
@@ -11,8 +11,8 @@ class One {
   get prop1(): string { return ""; }
 >prop1 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop1(s: string | number) { }
 >prop1 : string
@@ -44,8 +44,8 @@ class Two {
   get prop2(): string { return ""; }
 >prop2 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop2(s: string | 42) { }
 >prop2 : string
@@ -74,8 +74,8 @@ class Three {
   get prop2(): string { return ""; }
 >prop2 : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   set prop2(s: string | number | boolean) { }
 >prop2 : string
diff --git a/tests/baselines/reference/divergentAccessorsTypes6.types b/tests/baselines/reference/divergentAccessorsTypes6.types
index 6b10547df3e..9ceb9768602 100644
--- a/tests/baselines/reference/divergentAccessorsTypes6.types
+++ b/tests/baselines/reference/divergentAccessorsTypes6.types
@@ -20,16 +20,16 @@ declare const element: Element;
 >        : ^^^^^^^
 
 element.style = "color: red";
->element.style = "color: red" : string
->                             : ^^^^^^
+>element.style = "color: red" : "color: red"
+>                             : ^^^^^^^^^^^^
 >element.style : string
 >              : ^^^^^^
 >element : Element
 >        : ^^^^^^^
 >style : string
 >      : ^^^^^^
->"color: red" : string
->             : ^^^^^^
+>"color: red" : "color: red"
+>             : ^^^^^^^^^^^^
 
 element.style.animationTimingFunction;
 >element.style.animationTimingFunction : string
@@ -86,8 +86,8 @@ const o1 = {
     get x(): number { return 0; },
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set x(value: Fail<string>) {}
 >x : number
@@ -107,8 +107,8 @@ const o2 = {
     get p1() { return 0; }, // error - no annotation means type is implied from the setter annotation
 >p1 : string
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set p1(value: string) {},
 >p1 : string
@@ -119,8 +119,8 @@ const o2 = {
     get p2(): number { return 0; }, // ok - explicit annotation
 >p2 : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set p2(value: string) {},
 >p2 : number
diff --git a/tests/baselines/reference/divergentAccessorsTypes8.types b/tests/baselines/reference/divergentAccessorsTypes8.types
index 9f281c68656..684ef7c90af 100644
--- a/tests/baselines/reference/divergentAccessorsTypes8.types
+++ b/tests/baselines/reference/divergentAccessorsTypes8.types
@@ -81,16 +81,16 @@ declare const element: Element;
 >        : ^^^^^^^
 
 element['style'] = "color: red";
->element['style'] = "color: red" : string
->                                : ^^^^^^
+>element['style'] = "color: red" : "color: red"
+>                                : ^^^^^^^^^^^^
 >element['style'] : string
 >                 : ^^^^^^
 >element : Element
 >        : ^^^^^^^
 >'style' : "style"
 >        : ^^^^^^^
->"color: red" : string
->             : ^^^^^^
+>"color: red" : "color: red"
+>             : ^^^^^^^^^^^^
 
 element['style'] = element.style;
 >element['style'] = element.style : CSSStyleDeclaration
@@ -117,8 +117,8 @@ class One {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop1(s: string | number) {}
 >prop1 : string
@@ -131,8 +131,8 @@ class One {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop2(s: string | number) {}
 >prop2 : string
@@ -143,16 +143,16 @@ class One {
   prop3: number = 42;
 >prop3 : number
 >      : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
   get prop4(): string {
 >prop4 : string
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop4(s: string | number) {}
 >prop4 : string
@@ -170,8 +170,8 @@ class Two {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop1(s: string | number) {}
 >prop1 : string
@@ -184,8 +184,8 @@ class Two {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop2(s: string) {}
 >prop2 : string
@@ -198,8 +198,8 @@ class Two {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop3(s: string | boolean) {}
 >prop3 : string
@@ -212,8 +212,8 @@ class Two {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop4(s: string | boolean) {}
 >prop4 : string
@@ -227,52 +227,52 @@ declare const u1: One | Two;
 >   : ^^^^^^^^^
 
 u1['prop1'] = 42;
->u1['prop1'] = 42 : number
->                 : ^^^^^^
+>u1['prop1'] = 42 : 42
+>                 : ^^
 >u1['prop1'] : string | number
 >            : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >'prop1' : "prop1"
 >        : ^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 u1['prop1'] = "hello";
->u1['prop1'] = "hello" : string
->                      : ^^^^^^
+>u1['prop1'] = "hello" : "hello"
+>                      : ^^^^^^^
 >u1['prop1'] : string | number
 >            : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >'prop1' : "prop1"
 >        : ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 u1['prop2'] = 42;
->u1['prop2'] = 42 : number
->                 : ^^^^^^
+>u1['prop2'] = 42 : 42
+>                 : ^^
 >u1['prop2'] : string | number
 >            : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >'prop2' : "prop2"
 >        : ^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 u1['prop2'] = "hello";
->u1['prop2'] = "hello" : string
->                      : ^^^^^^
+>u1['prop2'] = "hello" : "hello"
+>                      : ^^^^^^^
 >u1['prop2'] : string | number
 >            : ^^^^^^^^^^^^^^^
 >u1 : One | Two
 >   : ^^^^^^^^^
 >'prop2' : "prop2"
 >        : ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 u1['prop3'] = 42;
 >u1['prop3'] = 42 : 42
@@ -361,28 +361,28 @@ const iv1 = i['prop1'];
 >        : ^^^^^^^
 
 i['prop1'] = 42;
->i['prop1'] = 42 : number
->                : ^^^^^^
+>i['prop1'] = 42 : 42
+>                : ^^
 >i['prop1'] : string | number
 >           : ^^^^^^^^^^^^^^^
 >i : One & Two
 >  : ^^^^^^^^^
 >'prop1' : "prop1"
 >        : ^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 i['prop1'] = "hello";
->i['prop1'] = "hello" : string
->                     : ^^^^^^
+>i['prop1'] = "hello" : "hello"
+>                     : ^^^^^^^
 >i['prop1'] : string | number
 >           : ^^^^^^^^^^^^^^^
 >i : One & Two
 >  : ^^^^^^^^^
 >'prop1' : "prop1"
 >        : ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 const iv2 = i['prop2'];
 >iv2 : string
@@ -395,28 +395,28 @@ const iv2 = i['prop2'];
 >        : ^^^^^^^
 
 i['prop2'] = 42;
->i['prop2'] = 42 : number
->                : ^^^^^^
+>i['prop2'] = 42 : 42
+>                : ^^
 >i['prop2'] : string
 >           : ^^^^^^
 >i : One & Two
 >  : ^^^^^^^^^
 >'prop2' : "prop2"
 >        : ^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 i['prop2'] = "hello";
->i['prop2'] = "hello" : string
->                     : ^^^^^^
+>i['prop2'] = "hello" : "hello"
+>                     : ^^^^^^^
 >i['prop2'] : string
 >           : ^^^^^^
 >i : One & Two
 >  : ^^^^^^^^^
 >'prop2' : "prop2"
 >        : ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 class Three {
 >Three : Three
@@ -427,8 +427,8 @@ class Three {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop1(s: string | number) {}
 >prop1 : string
@@ -439,8 +439,8 @@ class Three {
   prop2: number = 42;
 >prop2 : number
 >      : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 class Four {
@@ -466,8 +466,8 @@ class Four {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop2(s: string | 42) {}
 >prop2 : string
@@ -499,8 +499,8 @@ class Five {
 >      : ^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
   set prop2(s: string | number | boolean) {}
 >prop2 : string
@@ -584,8 +584,8 @@ class Six {
 >      : ^^^^^^^^^^^^^^^
 
     return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
   }
   set prop2(s: boolean | null) {}
 >prop2 : number | bigint
diff --git a/tests/baselines/reference/divergentAccessorsVisibility1.types b/tests/baselines/reference/divergentAccessorsVisibility1.types
index c6928f6ffbf..ea79168d975 100644
--- a/tests/baselines/reference/divergentAccessorsVisibility1.types
+++ b/tests/baselines/reference/divergentAccessorsVisibility1.types
@@ -118,112 +118,112 @@ class Base {
 >     : ^^^^^^^^^^
 
         this.PublicPublic = 0;
->this.PublicPublic = 0 : number
->                      : ^^^^^^
+>this.PublicPublic = 0 : 0
+>                      : ^
 >this.PublicPublic : number
 >                  : ^^^^^^
 >this : this
 >     : ^^^^
 >PublicPublic : number
 >             : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PublicProtected = 0;
->this.PublicProtected = 0 : number
->                         : ^^^^^^
+>this.PublicProtected = 0 : 0
+>                         : ^
 >this.PublicProtected : number
 >                     : ^^^^^^
 >this : this
 >     : ^^^^
 >PublicProtected : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PublicPrivate = 0;
->this.PublicPrivate = 0 : number
->                       : ^^^^^^
+>this.PublicPrivate = 0 : 0
+>                       : ^
 >this.PublicPrivate : number
 >                   : ^^^^^^
 >this : this
 >     : ^^^^
 >PublicPrivate : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.ProtectedPublic = 0;
->this.ProtectedPublic = 0 : number
->                         : ^^^^^^
+>this.ProtectedPublic = 0 : 0
+>                         : ^
 >this.ProtectedPublic : number
 >                     : ^^^^^^
 >this : this
 >     : ^^^^
 >ProtectedPublic : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.ProtectedProtected = 0;
->this.ProtectedProtected = 0 : number
->                            : ^^^^^^
+>this.ProtectedProtected = 0 : 0
+>                            : ^
 >this.ProtectedProtected : number
 >                        : ^^^^^^
 >this : this
 >     : ^^^^
 >ProtectedProtected : number
 >                   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.ProtectedPrivate = 0;
->this.ProtectedPrivate = 0 : number
->                          : ^^^^^^
+>this.ProtectedPrivate = 0 : 0
+>                          : ^
 >this.ProtectedPrivate : number
 >                      : ^^^^^^
 >this : this
 >     : ^^^^
 >ProtectedPrivate : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PrivatePublic = 0;
->this.PrivatePublic = 0 : number
->                       : ^^^^^^
+>this.PrivatePublic = 0 : 0
+>                       : ^
 >this.PrivatePublic : number
 >                   : ^^^^^^
 >this : this
 >     : ^^^^
 >PrivatePublic : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PrivateProtected = 0;
->this.PrivateProtected = 0 : number
->                          : ^^^^^^
+>this.PrivateProtected = 0 : 0
+>                          : ^
 >this.PrivateProtected : number
 >                      : ^^^^^^
 >this : this
 >     : ^^^^
 >PrivateProtected : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PrivatePrivate = 0;
->this.PrivatePrivate = 0 : number
->                        : ^^^^^^
+>this.PrivatePrivate = 0 : 0
+>                        : ^
 >this.PrivatePrivate : number
 >                    : ^^^^^^
 >this : this
 >     : ^^^^
 >PrivatePrivate : number
 >               : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         void this.PublicPublic;
 >void this.PublicPublic : undefined
@@ -436,112 +436,112 @@ class Derived extends Base {
 >      : ^^^^^^^^^^
 
         this.PublicPublic = 0;
->this.PublicPublic = 0 : number
->                      : ^^^^^^
+>this.PublicPublic = 0 : 0
+>                      : ^
 >this.PublicPublic : number
 >                  : ^^^^^^
 >this : this
 >     : ^^^^
 >PublicPublic : number
 >             : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PublicProtected = 0;
->this.PublicProtected = 0 : number
->                         : ^^^^^^
+>this.PublicProtected = 0 : 0
+>                         : ^
 >this.PublicProtected : number
 >                     : ^^^^^^
 >this : this
 >     : ^^^^
 >PublicProtected : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PublicPrivate = 0;
->this.PublicPrivate = 0 : number
->                       : ^^^^^^
+>this.PublicPrivate = 0 : 0
+>                       : ^
 >this.PublicPrivate : number
 >                   : ^^^^^^
 >this : this
 >     : ^^^^
 >PublicPrivate : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.ProtectedPublic = 0;
->this.ProtectedPublic = 0 : number
->                         : ^^^^^^
+>this.ProtectedPublic = 0 : 0
+>                         : ^
 >this.ProtectedPublic : number
 >                     : ^^^^^^
 >this : this
 >     : ^^^^
 >ProtectedPublic : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.ProtectedProtected = 0;
->this.ProtectedProtected = 0 : number
->                            : ^^^^^^
+>this.ProtectedProtected = 0 : 0
+>                            : ^
 >this.ProtectedProtected : number
 >                        : ^^^^^^
 >this : this
 >     : ^^^^
 >ProtectedProtected : number
 >                   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.ProtectedPrivate = 0;
->this.ProtectedPrivate = 0 : number
->                          : ^^^^^^
+>this.ProtectedPrivate = 0 : 0
+>                          : ^
 >this.ProtectedPrivate : number
 >                      : ^^^^^^
 >this : this
 >     : ^^^^
 >ProtectedPrivate : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PrivatePublic = 0;
->this.PrivatePublic = 0 : number
->                       : ^^^^^^
+>this.PrivatePublic = 0 : 0
+>                       : ^
 >this.PrivatePublic : number
 >                   : ^^^^^^
 >this : this
 >     : ^^^^
 >PrivatePublic : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PrivateProtected = 0;
->this.PrivateProtected = 0 : number
->                          : ^^^^^^
+>this.PrivateProtected = 0 : 0
+>                          : ^
 >this.PrivateProtected : number
 >                      : ^^^^^^
 >this : this
 >     : ^^^^
 >PrivateProtected : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.PrivatePrivate = 0;
->this.PrivatePrivate = 0 : number
->                        : ^^^^^^
+>this.PrivatePrivate = 0 : 0
+>                        : ^
 >this.PrivatePrivate : number
 >                    : ^^^^^^
 >this : this
 >     : ^^^^
 >PrivatePrivate : number
 >               : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         void this.PublicPublic;
 >void this.PublicPublic : undefined
@@ -754,112 +754,112 @@ function fn() {
 >   : ^^^^^^^^^^
 
     base.PublicPublic = 0;
->base.PublicPublic = 0 : number
->                      : ^^^^^^
+>base.PublicPublic = 0 : 0
+>                      : ^
 >base.PublicPublic : number
 >                  : ^^^^^^
 >base : Base
 >     : ^^^^
 >PublicPublic : number
 >             : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.PublicProtected = 0;
->base.PublicProtected = 0 : number
->                         : ^^^^^^
+>base.PublicProtected = 0 : 0
+>                         : ^
 >base.PublicProtected : number
 >                     : ^^^^^^
 >base : Base
 >     : ^^^^
 >PublicProtected : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.PublicPrivate = 0;
->base.PublicPrivate = 0 : number
->                       : ^^^^^^
+>base.PublicPrivate = 0 : 0
+>                       : ^
 >base.PublicPrivate : number
 >                   : ^^^^^^
 >base : Base
 >     : ^^^^
 >PublicPrivate : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.ProtectedPublic = 0;
->base.ProtectedPublic = 0 : number
->                         : ^^^^^^
+>base.ProtectedPublic = 0 : 0
+>                         : ^
 >base.ProtectedPublic : number
 >                     : ^^^^^^
 >base : Base
 >     : ^^^^
 >ProtectedPublic : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.ProtectedProtected = 0;
->base.ProtectedProtected = 0 : number
->                            : ^^^^^^
+>base.ProtectedProtected = 0 : 0
+>                            : ^
 >base.ProtectedProtected : number
 >                        : ^^^^^^
 >base : Base
 >     : ^^^^
 >ProtectedProtected : number
 >                   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.ProtectedPrivate = 0;
->base.ProtectedPrivate = 0 : number
->                          : ^^^^^^
+>base.ProtectedPrivate = 0 : 0
+>                          : ^
 >base.ProtectedPrivate : number
 >                      : ^^^^^^
 >base : Base
 >     : ^^^^
 >ProtectedPrivate : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.PrivatePublic = 0;
->base.PrivatePublic = 0 : number
->                       : ^^^^^^
+>base.PrivatePublic = 0 : 0
+>                       : ^
 >base.PrivatePublic : number
 >                   : ^^^^^^
 >base : Base
 >     : ^^^^
 >PrivatePublic : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.PrivateProtected = 0;
->base.PrivateProtected = 0 : number
->                          : ^^^^^^
+>base.PrivateProtected = 0 : 0
+>                          : ^
 >base.PrivateProtected : number
 >                      : ^^^^^^
 >base : Base
 >     : ^^^^
 >PrivateProtected : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     base.PrivatePrivate = 0;
->base.PrivatePrivate = 0 : number
->                        : ^^^^^^
+>base.PrivatePrivate = 0 : 0
+>                        : ^
 >base.PrivatePrivate : number
 >                    : ^^^^^^
 >base : Base
 >     : ^^^^
 >PrivatePrivate : number
 >               : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     void base.PublicPublic;
 >void base.PublicPublic : undefined
@@ -1060,112 +1060,112 @@ function fn() {
 >  : ^
 
     deriv.PublicPublic = 0;
->deriv.PublicPublic = 0 : number
->                       : ^^^^^^
+>deriv.PublicPublic = 0 : 0
+>                       : ^
 >deriv.PublicPublic : number
 >                   : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >PublicPublic : number
 >             : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.PublicProtected = 0;
->deriv.PublicProtected = 0 : number
->                          : ^^^^^^
+>deriv.PublicProtected = 0 : 0
+>                          : ^
 >deriv.PublicProtected : number
 >                      : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >PublicProtected : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.PublicPrivate = 0;
->deriv.PublicPrivate = 0 : number
->                        : ^^^^^^
+>deriv.PublicPrivate = 0 : 0
+>                        : ^
 >deriv.PublicPrivate : number
 >                    : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >PublicPrivate : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.ProtectedPublic = 0;
->deriv.ProtectedPublic = 0 : number
->                          : ^^^^^^
+>deriv.ProtectedPublic = 0 : 0
+>                          : ^
 >deriv.ProtectedPublic : number
 >                      : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >ProtectedPublic : number
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.ProtectedProtected = 0;
->deriv.ProtectedProtected = 0 : number
->                             : ^^^^^^
+>deriv.ProtectedProtected = 0 : 0
+>                             : ^
 >deriv.ProtectedProtected : number
 >                         : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >ProtectedProtected : number
 >                   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.ProtectedPrivate = 0;
->deriv.ProtectedPrivate = 0 : number
->                           : ^^^^^^
+>deriv.ProtectedPrivate = 0 : 0
+>                           : ^
 >deriv.ProtectedPrivate : number
 >                       : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >ProtectedPrivate : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.PrivatePublic = 0;
->deriv.PrivatePublic = 0 : number
->                        : ^^^^^^
+>deriv.PrivatePublic = 0 : 0
+>                        : ^
 >deriv.PrivatePublic : number
 >                    : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >PrivatePublic : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.PrivateProtected = 0;
->deriv.PrivateProtected = 0 : number
->                           : ^^^^^^
+>deriv.PrivateProtected = 0 : 0
+>                           : ^
 >deriv.PrivateProtected : number
 >                       : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >PrivateProtected : number
 >                 : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     deriv.PrivatePrivate = 0;
->deriv.PrivatePrivate = 0 : number
->                         : ^^^^^^
+>deriv.PrivatePrivate = 0 : 0
+>                         : ^
 >deriv.PrivatePrivate : number
 >                     : ^^^^^^
 >deriv : Derived
 >      : ^^^^^^^
 >PrivatePrivate : number
 >               : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     void deriv.PublicPublic;
 >void deriv.PublicPublic : undefined
diff --git a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
index 7b3a33bc866..e788de04bae 100644
--- a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
+++ b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
@@ -30,8 +30,8 @@ var test: IIntervalTreeNode[] = [{ interval: { begin: 0 }, children: null }]; //
 >             : ^^^^^^^^^^^^^^^^^^
 >begin : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >children : null
 >         : ^^^^
 
diff --git a/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types b/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types
index 38f7398fe00..bcecd28924a 100644
--- a/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types
+++ b/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types
@@ -124,8 +124,8 @@ const testAtomics = Atomics.add(new Uint8Array(0), 0, 0);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >0 : 0
 >  : ^
 >0 : 0
@@ -189,8 +189,8 @@ const testRegExpExecArrayGroups = /(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[
 >                                                         : ^^^^^^
 >exec : (string: string) => RegExpExecArray | null
 >     : ^      ^^      ^^^^^                      
->"2019-04-30" : string
->             : ^^^^^^
+>"2019-04-30" : "2019-04-30"
+>             : ^^^^^^^^^^^^
 >groups : any
 >       : ^^^
 
@@ -366,8 +366,8 @@ const testSymbolDescription = Symbol("foo").description;
 >              : ^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >description : any
 >            : ^^^
 
diff --git a/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2023(target=esnext).types b/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2023(target=esnext).types
index 455366d2b1c..90d3ec6d7ae 100644
--- a/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2023(target=esnext).types
+++ b/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2023(target=esnext).types
@@ -117,8 +117,8 @@ export let spliced1 = array.toSpliced(2);
 >      : ^^^^^^^^
 >toSpliced : { (start: number, deleteCount: number, ...items: number[]): number[]; (start: number, deleteCount?: number): number[]; }
 >          : ^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 export let spliced2 = array.toSpliced(2, 1);
 >spliced2 : number[]
@@ -131,10 +131,10 @@ export let spliced2 = array.toSpliced(2, 1);
 >      : ^^^^^^^^
 >toSpliced : { (start: number, deleteCount: number, ...items: number[]): number[]; (start: number, deleteCount?: number): number[]; }
 >          : ^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 export let spliced3 = array.toSpliced(2, 1, 4, 5, 6, 7);
 >spliced3 : number[]
@@ -147,18 +147,18 @@ export let spliced3 = array.toSpliced(2, 1, 4, 5, 6, 7);
 >      : ^^^^^^^^
 >toSpliced : { (start: number, deleteCount: number, ...items: number[]): number[]; (start: number, deleteCount?: number): number[]; }
 >          : ^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
->7 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
+>7 : 7
+>  : ^
 
 export let spliced4 = array.toSpliced(2, undefined);
 >spliced4 : number[]
@@ -171,8 +171,8 @@ export let spliced4 = array.toSpliced(2, undefined);
 >      : ^^^^^^^^
 >toSpliced : { (start: number, deleteCount: number, ...items: number[]): number[]; (start: number, deleteCount?: number): number[]; }
 >          : ^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -187,18 +187,18 @@ export let spliced5 = array.toSpliced(2, undefined, 4, 5, 6, 7);
 >      : ^^^^^^^^
 >toSpliced : { (start: number, deleteCount: number, ...items: number[]): number[]; (start: number, deleteCount?: number): number[]; }
 >          : ^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
->7 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
+>7 : 7
+>  : ^
 
 export let startsWithOne = array.with(0, 1);
 >startsWithOne : number[]
@@ -211,10 +211,10 @@ export let startsWithOne = array.with(0, 1);
 >      : ^^^^^^^^
 >with : (index: number, value: number) => number[]
 >     : ^     ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
 export let inTheEnd = array.with(-1, 1);
 >inTheEnd : number[]
@@ -231,6 +231,6 @@ export let inTheEnd = array.with(-1, 1);
 >   : ^^
 >1 : 1
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/dottedModuleName.types b/tests/baselines/reference/dottedModuleName.types
index 1e48644c958..29eb2fff715 100644
--- a/tests/baselines/reference/dottedModuleName.types
+++ b/tests/baselines/reference/dottedModuleName.types
@@ -67,8 +67,8 @@ module M.N {
 >      : ^^^
 >f : (x: number) => any
 >  : ^ ^^      ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 	}
     }
 }
diff --git a/tests/baselines/reference/dottedSymbolResolution1.types b/tests/baselines/reference/dottedSymbolResolution1.types
index df9a5e07135..04210bb3944 100644
--- a/tests/baselines/reference/dottedSymbolResolution1.types
+++ b/tests/baselines/reference/dottedSymbolResolution1.types
@@ -82,8 +82,8 @@ function _setBarAndText(): void {
 >  : ^^^^^^
 >find : (selector: string) => JQuery
 >     : ^        ^^      ^^^^^      
->" " : string
->    : ^^^^^^
+>" " : " "
+>    : ^^^
 >function () {        var $this: JQuery = $(''),            thisBar = $this.find(".fx-usagebars-calloutbar-this"); // bug lead to 'could not find dotted symbol' here    } : () => void
 >                                                                                                                                                                          : ^^^^^^^^^^
 
@@ -94,8 +94,8 @@ function _setBarAndText(): void {
 >      : ^^^^^^
 >$ : JQueryStatic
 >  : ^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
             thisBar = $this.find(".fx-usagebars-calloutbar-this"); // bug lead to 'could not find dotted symbol' here
 >thisBar : JQuery
@@ -108,8 +108,8 @@ function _setBarAndText(): void {
 >      : ^^^^^^
 >find : (selector: string) => JQuery
 >     : ^        ^^      ^^^^^      
->".fx-usagebars-calloutbar-this" : string
->                                : ^^^^^^
+>".fx-usagebars-calloutbar-this" : ".fx-usagebars-calloutbar-this"
+>                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     } );
 }
diff --git a/tests/baselines/reference/doubleUnderscoreEnumEmit.types b/tests/baselines/reference/doubleUnderscoreEnumEmit.types
index ef1bdf43bd9..976da4c5030 100644
--- a/tests/baselines/reference/doubleUnderscoreEnumEmit.types
+++ b/tests/baselines/reference/doubleUnderscoreEnumEmit.types
@@ -38,8 +38,8 @@ namespace Foo {
 >        : ^^^^^^      
 
         return 5;
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
 function Bar() {
@@ -61,7 +61,7 @@ namespace Bar {
 >  : ^^^^^^
 
         return 5;
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/doubleUnderscoreMappedTypes.types b/tests/baselines/reference/doubleUnderscoreMappedTypes.types
index e17c87bd3da..a35bd4c8d33 100644
--- a/tests/baselines/reference/doubleUnderscoreMappedTypes.types
+++ b/tests/baselines/reference/doubleUnderscoreMappedTypes.types
@@ -21,14 +21,14 @@ const ok: Properties = {
     property1: "",
 >property1 : string
 >          : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     __property2: ""
 >__property2 : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 };
 
@@ -58,14 +58,14 @@ const partial: Partial<Properties> = {
     property1: "",
 >property1 : string
 >          : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     __property2: ""
 >__property2 : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/downlevelLetConst10.types b/tests/baselines/reference/downlevelLetConst10.types
index 850d6142698..ff8e70f6619 100644
--- a/tests/baselines/reference/downlevelLetConst10.types
+++ b/tests/baselines/reference/downlevelLetConst10.types
@@ -4,6 +4,6 @@
 let a: number = 1
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/downlevelLetConst17.types b/tests/baselines/reference/downlevelLetConst17.types
index 36cc76ad1a9..1e6193638c4 100644
--- a/tests/baselines/reference/downlevelLetConst17.types
+++ b/tests/baselines/reference/downlevelLetConst17.types
@@ -61,12 +61,12 @@ for (; ;) {
 >  : ^^^^^^
 
     x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 for (; ;) {
diff --git a/tests/baselines/reference/downlevelLetConst5.types b/tests/baselines/reference/downlevelLetConst5.types
index 5f984497de3..576fd216410 100644
--- a/tests/baselines/reference/downlevelLetConst5.types
+++ b/tests/baselines/reference/downlevelLetConst5.types
@@ -4,6 +4,6 @@
 const a: number = 1
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/duplicateClassElements.types b/tests/baselines/reference/duplicateClassElements.types
index 45c100153d9..06785166cff 100644
--- a/tests/baselines/reference/duplicateClassElements.types
+++ b/tests/baselines/reference/duplicateClassElements.types
@@ -45,8 +45,8 @@ class a {
 >  : ^^^^^^
 
         return "Hello";
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
     }
     set y(_y: string) {
 >y : string
@@ -79,8 +79,8 @@ class a {
 >   : ^^^^^^
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set x2(_x: number) {
 >x2 : number
@@ -97,8 +97,8 @@ class a {
 >   : ^^^^^^
 
         return "Hello";
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
     }
     set z2(_y: string) {
 >z2 : string
diff --git a/tests/baselines/reference/duplicateErrorAssignability.types b/tests/baselines/reference/duplicateErrorAssignability.types
index d56db103cd8..0891d470381 100644
--- a/tests/baselines/reference/duplicateErrorAssignability.types
+++ b/tests/baselines/reference/duplicateErrorAssignability.types
@@ -39,8 +39,8 @@ let obj: { 3: string } = { 3: "three" };
 >               : ^^^^^^^^^^^^^^
 >3 : string
 >  : ^^^^^^
->"three" : string
->        : ^^^^^^
+>"three" : "three"
+>        : ^^^^^^^
 
 obj[x];
 >obj[x] : any
diff --git a/tests/baselines/reference/duplicateErrorClassExpression.types b/tests/baselines/reference/duplicateErrorClassExpression.types
index cc8c9389a5c..161fd69918a 100644
--- a/tests/baselines/reference/duplicateErrorClassExpression.types
+++ b/tests/baselines/reference/duplicateErrorClassExpression.types
@@ -52,8 +52,8 @@ let obj: { 3: string } = { 3: "three" };
 >               : ^^^^^^^^^^^^^^
 >3 : string
 >  : ^^^^^^
->"three" : string
->        : ^^^^^^
+>"three" : "three"
+>        : ^^^^^^^
 
 obj[x];
 >obj[x] : any
diff --git a/tests/baselines/reference/duplicateLocalVariable1.types b/tests/baselines/reference/duplicateLocalVariable1.types
index 0266813355f..30c54069660 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.types
+++ b/tests/baselines/reference/duplicateLocalVariable1.types
@@ -355,8 +355,8 @@ export var tests: TestRunner = (function () {
 >                                                         : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Basic test" : string
->             : ^^^^^^
+>"Basic test" : "Basic test"
+>             : ^^^^^^^^^^^^
 >function () { return true; } : () => true
 >                             : ^^^^^^^^^^
 >true : true
@@ -375,8 +375,8 @@ export var tests: TestRunner = (function () {
 >                                                                                         : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test for any error" : string
->                     : ^^^^^^
+>"Test for any error" : "Test for any error"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 >function () { throw new Error(); return false; } : () => false
 >                                                 : ^^^^^^^^^^^
 >new Error() : Error
@@ -385,8 +385,8 @@ export var tests: TestRunner = (function () {
 >      : ^^^^^^^^^^^^^^^^
 >false : false
 >      : ^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     testRunner.addTest(new TestCase("Test RegEx error message match", function () { throw new Error("Should also pass"); return false; }, "Should [also]+ pass"));
 >testRunner.addTest(new TestCase("Test RegEx error message match", function () { throw new Error("Should also pass"); return false; }, "Should [also]+ pass")) : void
@@ -401,20 +401,20 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                          : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test RegEx error message match" : string
->                                 : ^^^^^^
+>"Test RegEx error message match" : "Test RegEx error message match"
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function () { throw new Error("Should also pass"); return false; } : () => false
 >                                                                   : ^^^^^^^^^^^
 >new Error("Should also pass") : Error
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Should also pass" : string
->                   : ^^^^^^
+>"Should also pass" : "Should also pass"
+>                   : ^^^^^^^^^^^^^^^^^^
 >false : false
 >      : ^^^^^
->"Should [also]+ pass" : string
->                      : ^^^^^^
+>"Should [also]+ pass" : "Should [also]+ pass"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Test array compare true", function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); }));
 >testRunner.addTest(new TestCase("Test array compare true", function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); })) : void
@@ -429,8 +429,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                               : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test array compare true" : string
->                          : ^^^^^^
+>"Test array compare true" : "Test array compare true"
+>                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); } : () => boolean
 >                                                                      : ^^^^^^^^^^^^^
 >TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]) : boolean
@@ -471,8 +471,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                 : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test array compare false" : string
->                           : ^^^^^^
+>"Test array compare false" : "Test array compare false"
+>                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function () { return !TestRunner.arrayCompare([3, 2, 3], [1, 2, 3]); } : () => boolean
 >                                                                       : ^^^^^^^^^^^^^
 >!TestRunner.arrayCompare([3, 2, 3], [1, 2, 3]) : boolean
@@ -516,8 +516,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                        : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check file exists" : string
->                    : ^^^^^^
+>"Check file exists" : "Check file exists"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            return FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test.txt");        } : () => any
@@ -557,8 +557,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                 : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check file doesn't exist" : string
->                           : ^^^^^^
+>"Check file doesn't exist" : "Check file doesn't exist"
+>                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            return !FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test2.txt");        } : () => boolean
@@ -602,8 +602,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                    : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check text file match" : string
->                        : ^^^^^^
+>"Check text file match" : "Check text file match"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            return (FileManager.FileBuffer.isTextFile("C:\\somedir\\readme.txt") &&                FileManager.FileBuffer.isTextFile("C:\\spaces path\\myapp.str") &&                FileManager.FileBuffer.isTextFile("C:\\somedir\\code.js"))        } : () => any
@@ -677,8 +677,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                   : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check makefile match" : string
->                       : ^^^^^^
+>"Check makefile match" : "Check makefile match"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            return FileManager.FileBuffer.isTextFile("C:\\some dir\\makefile");        } : () => any
@@ -714,8 +714,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                           : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check binary file doesn't match" : string
->                                  : ^^^^^^
+>"Check binary file doesn't match" : "Check binary file doesn't match"
+>                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            return (!FileManager.FileBuffer.isTextFile("C:\\somedir\\app.exe") &&            !FileManager.FileBuffer.isTextFile("C:\\somedir\\my lib.dll"));        } : () => boolean
@@ -777,8 +777,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                           : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check App defaults" : string
->                     : ^^^^^^
+>"Check App defaults" : "Check App defaults"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var app = new App.App([]);            return (app.fixLines === false &&                   app.recurse === true &&                   app.lineEndings === "CRLF" &&                   app.matchPattern === undefined &&                   app.rootDirectory === ".\\" &&                   app.encodings[0] === "ascii" &&                   app.encodings[1] === "utf8nobom");        } : () => boolean
@@ -918,8 +918,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check App params" : string
->                   : ^^^^^^
+>"Check App params" : "Check App params"
+>                   : ^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var app = new App.App(["-dir=C:\\test dir", "-lineEndings=LF", "-encodings=utf16be,ascii", "-recurse=false", "-fixlines"]);            return (app.fixLines === true &&                   app.lineEndings === "LF" &&                   app.recurse === false &&                   app.matchPattern === undefined &&                   app.rootDirectory === "C:\\test dir" &&                   app.encodings[0] === "utf16be" &&                   app.encodings[1] === "ascii" &&                   app.encodings.length === 2);        } : () => boolean
@@ -1089,8 +1089,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                           : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check encoding detection no BOM" : string
->                                  : ^^^^^^
+>"Check encoding detection no BOM" : "Check encoding detection no BOM"
+>                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\noBOM.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        } : () => boolean
@@ -1152,8 +1152,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                               : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check encoding detection UTF8 BOM" : string
->                                    : ^^^^^^
+>"Check encoding detection UTF8 BOM" : "Check encoding detection UTF8 BOM"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");            return fb.bom === 'utf8' && fb.encoding === 'utf8';        } : () => boolean
@@ -1215,8 +1215,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                        : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check encoding detection UTF16be BOM" : string
->                                       : ^^^^^^
+>"Check encoding detection UTF16be BOM" : "Check encoding detection UTF16be BOM"
+>                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16BE.txt");            return fb.bom === 'utf16be' && fb.encoding === 'utf16be';        } : () => boolean
@@ -1278,8 +1278,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                        : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check encoding detection UTF16le BOM" : string
->                                       : ^^^^^^
+>"Check encoding detection UTF16le BOM" : "Check encoding detection UTF16le BOM"
+>                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16LE.txt");            return fb.bom === 'utf16le' && fb.encoding === 'utf16le';        } : () => boolean
@@ -1341,8 +1341,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                              : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check encoding on 1 bytes file" : string
->                                 : ^^^^^^
+>"Check encoding on 1 bytes file" : "Check encoding on 1 bytes file"
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\1bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        } : () => boolean
@@ -1404,8 +1404,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                              : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check encoding on 0 bytes file" : string
->                                 : ^^^^^^
+>"Check encoding on 0 bytes file" : "Check encoding on 0 bytes file"
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\0bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        } : () => boolean
@@ -1469,8 +1469,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                  : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check byte reader" : string
->                    : ^^^^^^
+>"Check byte reader" : "Check byte reader"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");            var chars = [];            for (var i = 0; i < 11; i++) {                chars.push(fb.readByte());            }            return TestRunner.arrayCompare(chars, [0x54, 0xC3, 0xA8, 0xE1, 0xB4, 0xA3, 0xE2, 0x80, 0xA0, 0x0D, 0x0A]);        } : () => boolean
@@ -1586,8 +1586,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                          : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check UTF8 decoding" : string
->                      : ^^^^^^
+>"Check UTF8 decoding" : "Check UTF8 decoding"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");            var chars = [];            for (var i = 0; i < 6; i++) {                chars.push(fb.readUtf8CodePoint());            }            return TestRunner.arrayCompare(chars, [0x0054, 0x00E8, 0x1D23, 0x2020, 0x000D, 0x000A]);        } : () => boolean
@@ -1692,8 +1692,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check UTF8 encoding" : string
->                      : ^^^^^^
+>"Check UTF8 encoding" : "Check UTF8 encoding"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb = new FileManager.FileBuffer(20);            fb.writeUtf8Bom();            var chars = [0x0054, 0x00E8, 0x1D23, 0x2020, 0x000D, 0x000A];            for (var i in chars) {                fb.writeUtf8CodePoint(chars[i]);            }            fb.index = 0;            var bytes = [];            for (var i = 0; i < 14; i++) {                bytes.push(fb.readByte());            }            var expected = [0xEF, 0xBB, 0xBF, 0x54, 0xC3, 0xA8, 0xE1, 0xB4, 0xA3, 0xE2, 0x80, 0xA0, 0x0D, 0x0A];            return TestRunner.arrayCompare(bytes, expected);        } : () => boolean
@@ -1879,8 +1879,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check saving a file" : string
->                      : ^^^^^^
+>"Check saving a file" : "Check saving a file"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\tmpUTF16LE.txt";            var fb = new FileManager.FileBuffer(14);            fb.writeUtf16leBom();            var chars = [0x0054, 0x00E8, 0x1D23, 0x2020, 0x000D, 0x000A];            chars.forEach(function (val) { fb.writeUtf16CodePoint(val, false); });            fb.save(filename);            var savedFile = new FileManager.FileBuffer(filename);            if (savedFile.encoding !== 'utf16le') {                throw Error("Incorrect encoding");            }            var expectedBytes = [0xFF, 0xFE, 0x54, 0x00, 0xE8, 0x00, 0x23, 0x1D, 0x20, 0x20, 0x0D, 0x00, 0x0A, 0x00]            savedFile.index = 0;            expectedBytes.forEach(function (val) {                var byteVal = savedFile.readByte();                if (byteVal !== val) {                    throw Error("Incorrect byte value");                }            });            return true;        } : () => true
@@ -2007,8 +2007,8 @@ export var tests: TestRunner = (function () {
 >                            : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Incorrect encoding" : string
->                     : ^^^^^^
+>"Incorrect encoding" : "Incorrect encoding"
+>                     : ^^^^^^^^^^^^^^^^^^^^
             }
             var expectedBytes = [0xFF, 0xFE, 0x54, 0x00, 0xE8, 0x00, 0x23, 0x1D, 0x20, 0x20, 0x0D, 0x00, 0x0A, 0x00]
 >expectedBytes : number[]
@@ -2095,8 +2095,8 @@ export var tests: TestRunner = (function () {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Incorrect byte value" : string
->                       : ^^^^^^
+>"Incorrect byte value" : "Incorrect byte value"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
                 }
             });
             return true;
@@ -2118,8 +2118,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                           : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check reading past buffer asserts" : string
->                                    : ^^^^^^
+>"Check reading past buffer asserts" : "Check reading past buffer asserts"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     function () {
 >function () {        var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");        var result = fb.readByte(200);        return true;    } : () => true
@@ -2162,8 +2162,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
     }, "read beyond buffer length"));
->"read beyond buffer length" : string
->                            : ^^^^^^
+>"read beyond buffer length" : "read beyond buffer length"
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Check writing past buffer asserts",
 >testRunner.addTest(new TestCase("Check writing past buffer asserts",    function () {        var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");        fb.writeByte(5, 200);        return true;    }, "write beyond buffer length")) : void
@@ -2178,8 +2178,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                   : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check writing past buffer asserts" : string
->                                    : ^^^^^^
+>"Check writing past buffer asserts" : "Check writing past buffer asserts"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     function () {
 >function () {        var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");        fb.writeByte(5, 200);        return true;    } : () => true
@@ -2222,8 +2222,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
     }, "write beyond buffer length"));
->"write beyond buffer length" : string
->                             : ^^^^^^
+>"write beyond buffer length" : "write beyond buffer length"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     // Non-BMP unicode char tests
     testRunner.addTest(new TestCase("Read non-BMP utf16 chars",
@@ -2239,8 +2239,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Read non-BMP utf16 chars" : string
->                           : ^^^^^^
+>"Read non-BMP utf16 chars" : "Read non-BMP utf16 chars"
+>                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var savedFile = new FileManager.FileBuffer(TestFileDir + "\\utf16leNonBmp.txt");            if (savedFile.encoding !== 'utf16le') {                throw Error("Incorrect encoding");            }            var codePoints = [];            for (var i = 0; i < 6; i++) {                codePoints.push(savedFile.readUtf16CodePoint(false));            }            var expectedCodePoints = [0x10480, 0x10481, 0x10482, 0x54, 0x68, 0x69];            return TestRunner.arrayCompare(codePoints, expectedCodePoints);        } : () => boolean
@@ -2281,8 +2281,8 @@ export var tests: TestRunner = (function () {
 >                            : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Incorrect encoding" : string
->                     : ^^^^^^
+>"Incorrect encoding" : "Incorrect encoding"
+>                     : ^^^^^^^^^^^^^^^^^^^^
             }
 
             var codePoints = [];
@@ -2374,8 +2374,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Read non-BMP utf8 chars" : string
->                          : ^^^^^^
+>"Read non-BMP utf8 chars" : "Read non-BMP utf8 chars"
+>                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var savedFile = new FileManager.FileBuffer(TestFileDir + "\\utf8NonBmp.txt");            if (savedFile.encoding !== 'utf8') {                throw Error("Incorrect encoding");            }            var codePoints = [];            for (var i = 0; i < 6; i++) {                codePoints.push(savedFile.readUtf8CodePoint());            }            var expectedCodePoints = [0x10480, 0x10481, 0x10482, 0x54, 0x68, 0x69];            return TestRunner.arrayCompare(codePoints, expectedCodePoints);        } : () => boolean
@@ -2416,8 +2416,8 @@ export var tests: TestRunner = (function () {
 >                            : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Incorrect encoding" : string
->                     : ^^^^^^
+>"Incorrect encoding" : "Incorrect encoding"
+>                     : ^^^^^^^^^^^^^^^^^^^^
             }
 
             var codePoints = [];
@@ -2507,8 +2507,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Write non-BMP utf8 chars" : string
->                           : ^^^^^^
+>"Write non-BMP utf8 chars" : "Write non-BMP utf8 chars"
+>                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\tmpUTF8nonBmp.txt";            var fb = new FileManager.FileBuffer(15);            var chars = [0x10480, 0x10481, 0x10482, 0x54, 0x68, 0x69];            chars.forEach(function (val) { fb.writeUtf8CodePoint(val); });            fb.save(filename);            var savedFile = new FileManager.FileBuffer(filename);            if (savedFile.encoding !== 'utf8') {                throw Error("Incorrect encoding");            }            var expectedBytes = [0xF0, 0x90, 0x92, 0x80, 0xF0, 0x90, 0x92, 0x81, 0xF0, 0x90, 0x92, 0x82, 0x54, 0x68, 0x69];            expectedBytes.forEach(function (val) {                var byteVal = savedFile.readByte();                if (byteVal !== val) {                    throw Error("Incorrect byte value");                }            });            return true;        } : () => true
@@ -2623,8 +2623,8 @@ export var tests: TestRunner = (function () {
 >                            : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Incorrect encoding" : string
->                     : ^^^^^^
+>"Incorrect encoding" : "Incorrect encoding"
+>                     : ^^^^^^^^^^^^^^^^^^^^
             }
             var expectedBytes = [0xF0, 0x90, 0x92, 0x80, 0xF0, 0x90, 0x92, 0x81, 0xF0, 0x90, 0x92, 0x82, 0x54, 0x68, 0x69];
 >expectedBytes : number[]
@@ -2701,8 +2701,8 @@ export var tests: TestRunner = (function () {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Incorrect byte value" : string
->                       : ^^^^^^
+>"Incorrect byte value" : "Incorrect byte value"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
                 }
             });
             return true;
@@ -2724,8 +2724,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                        : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test invalid lead UTF8 byte" : string
->                              : ^^^^^^
+>"Test invalid lead UTF8 byte" : "Test invalid lead UTF8 byte"
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\utf8BadLeadByte.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -2760,8 +2760,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Invalid UTF8 byte sequence at index: 4"));
->"Invalid UTF8 byte sequence at index: 4" : string
->                                         : ^^^^^^
+>"Invalid UTF8 byte sequence at index: 4" : "Invalid UTF8 byte sequence at index: 4"
+>                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Test invalid tail UTF8 byte",
 >testRunner.addTest(new TestCase("Test invalid tail UTF8 byte",        function () {            var filename = TestFileDir + "\\utf8InvalidTail.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Trailing byte invalid at index: 8")) : void
@@ -2776,8 +2776,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                   : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test invalid tail UTF8 byte" : string
->                              : ^^^^^^
+>"Test invalid tail UTF8 byte" : "Test invalid tail UTF8 byte"
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\utf8InvalidTail.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -2812,8 +2812,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Trailing byte invalid at index: 8"));
->"Trailing byte invalid at index: 8" : string
->                                    : ^^^^^^
+>"Trailing byte invalid at index: 8" : "Trailing byte invalid at index: 8"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Test ANSI fails validation",
 >testRunner.addTest(new TestCase("Test ANSI fails validation",        function () {            var filename = TestFileDir + "\\ansi.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Trailing byte invalid at index: 6")) : void
@@ -2828,8 +2828,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                       : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test ANSI fails validation" : string
->                             : ^^^^^^
+>"Test ANSI fails validation" : "Test ANSI fails validation"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\ansi.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -2864,8 +2864,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Trailing byte invalid at index: 6"));
->"Trailing byte invalid at index: 6" : string
->                                    : ^^^^^^
+>"Trailing byte invalid at index: 6" : "Trailing byte invalid at index: 6"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Test UTF-16LE with invalid surrogate trail fails",
 >testRunner.addTest(new TestCase("Test UTF-16LE with invalid surrogate trail fails",        function () {            var filename = TestFileDir + "\\utf16leInvalidSurrogate.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Trail surrogate has an invalid value")) : void
@@ -2880,8 +2880,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                   : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test UTF-16LE with invalid surrogate trail fails" : string
->                                                   : ^^^^^^
+>"Test UTF-16LE with invalid surrogate trail fails" : "Test UTF-16LE with invalid surrogate trail fails"
+>                                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\utf16leInvalidSurrogate.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -2916,8 +2916,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Trail surrogate has an invalid value"));
->"Trail surrogate has an invalid value" : string
->                                       : ^^^^^^
+>"Trail surrogate has an invalid value" : "Trail surrogate has an invalid value"
+>                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Test UTF-16BE with invalid surrogate head fails",
 >testRunner.addTest(new TestCase("Test UTF-16BE with invalid surrogate head fails",        function () {            var filename = TestFileDir + "\\UTF16BEInvalidSurrogate.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Byte sequence starts with a trail surrogate")) : void
@@ -2932,8 +2932,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                         : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test UTF-16BE with invalid surrogate head fails" : string
->                                                  : ^^^^^^
+>"Test UTF-16BE with invalid surrogate head fails" : "Test UTF-16BE with invalid surrogate head fails"
+>                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\UTF16BEInvalidSurrogate.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -2968,8 +2968,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Byte sequence starts with a trail surrogate"));
->"Byte sequence starts with a trail surrogate" : string
->                                              : ^^^^^^
+>"Byte sequence starts with a trail surrogate" : "Byte sequence starts with a trail surrogate"
+>                                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     testRunner.addTest(new TestCase("Test UTF-16LE with missing trail surrogate fails",
 >testRunner.addTest(new TestCase("Test UTF-16LE with missing trail surrogate fails",        function () {            var filename = TestFileDir + "\\utf16leMissingTrailSurrogate.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Trail surrogate has an invalid value")) : void
@@ -2984,8 +2984,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                        : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test UTF-16LE with missing trail surrogate fails" : string
->                                                   : ^^^^^^
+>"Test UTF-16LE with missing trail surrogate fails" : "Test UTF-16LE with missing trail surrogate fails"
+>                                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\utf16leMissingTrailSurrogate.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -3020,8 +3020,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Trail surrogate has an invalid value"));
->"Trail surrogate has an invalid value" : string
->                                       : ^^^^^^
+>"Trail surrogate has an invalid value" : "Trail surrogate has an invalid value"
+>                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     // Count of CRs & LFs
     testRunner.addTest(new TestCase("Count character occurrences",
@@ -3037,8 +3037,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                         : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Count character occurrences" : string
->                              : ^^^^^^
+>"Count character occurrences" : "Count character occurrences"
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\charCountASCII.txt";            var fb = new FileManager.FileBuffer(filename);            var result = (fb.countCR === 5 && fb.countLF === 4 && fb.countCRLF === 5 && fb.countHT === 3);            return result;        } : () => boolean
@@ -3140,8 +3140,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                             : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Test file with control character" : string
->                                   : ^^^^^^
+>"Test file with control character" : "Test file with control character"
+>                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var filename = TestFileDir + "\\controlChar.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        } : () => true
@@ -3176,8 +3176,8 @@ export var tests: TestRunner = (function () {
 >     : ^^^^
 
         }, "Codepoint at index: 3 has control value: 8"));
->"Codepoint at index: 3 has control value: 8" : string
->                                             : ^^^^^^
+>"Codepoint at index: 3 has control value: 8" : "Codepoint at index: 3 has control value: 8"
+>                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     return testRunner;
 >testRunner : TestRunner
diff --git a/tests/baselines/reference/duplicateLocalVariable2.types b/tests/baselines/reference/duplicateLocalVariable2.types
index c314c11f26c..159bf111b20 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.types
+++ b/tests/baselines/reference/duplicateLocalVariable2.types
@@ -70,8 +70,8 @@ export var tests: TestRunner = (function () {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            : ^^^^^^^^
 >TestCase : typeof TestCase
 >         : ^^^^^^^^^^^^^^^
->"Check UTF8 encoding" : string
->                      : ^^^^^^
+>"Check UTF8 encoding" : "Check UTF8 encoding"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
         function () {
 >function () {            var fb: any;            fb.writeUtf8Bom();            var chars = [0x0054];            for (var i in chars) {                fb.writeUtf8CodePoint(chars[i]);            }            fb.index = 0;            var bytes = [];            for (var i = 0; i < 14; i++) {                bytes.push(fb.readByte());            }            var expected = [0xEF];            return TestRunner.arrayCompare(bytes, expected);        } : () => boolean
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.types b/tests/baselines/reference/duplicateObjectLiteralProperty.types
index 850095628bb..208b46b2fe3 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty.types
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty.types
@@ -61,8 +61,8 @@ var y = {
     get a() { return 0; },
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set a(v: number) { },
 >a : number
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types b/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types
index 28992da5922..439a70c9aef 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types
@@ -16,12 +16,12 @@ function bar(props: { x?: string; y?: string }) {
   const { x = "", y = "" } = props;
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >props : { x?: string; y?: string; }
 >      : ^^^^^^      ^^^^^^      ^^^
 
@@ -53,12 +53,12 @@ function foo({ x = "", y = "" }: { x?: string; y?: string }) {
 >    : ^        ^^                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
 >y : string | undefined
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.types b/tests/baselines/reference/dynamicImportInDefaultExportExpression.types
index 6cf39e7599d..8edcfabeb78 100644
--- a/tests/baselines/reference/dynamicImportInDefaultExportExpression.types
+++ b/tests/baselines/reference/dynamicImportInDefaultExportExpression.types
@@ -14,7 +14,7 @@ export default {
         return import('./foo2');
 >import('./foo2') : Promise<any>
 >                 : ^^^^^^^^^^^^
->'./foo2' : string
->         : ^^^^^^
+>'./foo2' : "./foo2"
+>         : ^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/dynamicImportsDeclaration.types b/tests/baselines/reference/dynamicImportsDeclaration.types
index eb7c73b2754..e7011d0ee10 100644
--- a/tests/baselines/reference/dynamicImportsDeclaration.types
+++ b/tests/baselines/reference/dynamicImportsDeclaration.types
@@ -28,8 +28,8 @@ export const mod = await (async () => {
   const x: number = 0;
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   switch (x) {
 >x : number
@@ -44,8 +44,8 @@ export const mod = await (async () => {
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./case0.js") : Promise<{ default: typeof import("/case0"); }>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./case0.js" : string
->             : ^^^^^^
+>"./case0.js" : "./case0.js"
+>             : ^^^^^^^^^^^^
 
     case 1:
 >1 : 1
@@ -56,8 +56,8 @@ export const mod = await (async () => {
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./case1.js") : Promise<{ default: typeof import("/case1"); }>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./case1.js" : string
->             : ^^^^^^
+>"./case1.js" : "./case1.js"
+>             : ^^^^^^^^^^^^
 
     default:
       return await import("./caseFallback.js");
@@ -65,7 +65,7 @@ export const mod = await (async () => {
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./caseFallback.js") : Promise<{ default: typeof import("/caseFallback"); }>
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./caseFallback.js" : string
->                    : ^^^^^^
+>"./caseFallback.js" : "./caseFallback.js"
+>                    : ^^^^^^^^^^^^^^^^^^^
   }
 })();
diff --git a/tests/baselines/reference/dynamicNamesErrors.types b/tests/baselines/reference/dynamicNamesErrors.types
index 4297b292719..e36c63843a2 100644
--- a/tests/baselines/reference/dynamicNamesErrors.types
+++ b/tests/baselines/reference/dynamicNamesErrors.types
@@ -140,16 +140,16 @@ export class ClassMemberVisibility {
 >    : ^^^^^^      
 >y : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static get [z](): number { return 0; }
 >[z] : number
 >    : ^^^^^^
 >z : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static set [w](value: number) { }
 >[w] : number
@@ -170,16 +170,16 @@ export class ClassMemberVisibility {
 >    : ^^^^^^      
 >y : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     get [z](): number { return 0; }
 >[z] : number
 >    : ^^^^^^
 >z : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set [w](value: number) { }
 >[w] : number
@@ -227,16 +227,16 @@ export const ObjectLiteralVisibility = {
 >    : ^^^^^^      
 >y : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     get [z](): number { return 0; },
 >[z] : number
 >    : ^^^^^^
 >z : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set [w](value: number) { },
 >[w] : number
diff --git a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types
index 28d0c13bdfc..a0f0cb11f93 100644
--- a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types
+++ b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types
@@ -15,12 +15,12 @@
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"1" : string
 >    : ^^^^^^
->"one" : string
->      : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
 >"2" : string
 >    : ^^^^^^
->"two" : string
->      : ^^^^^^
+>"two" : "two"
+>      : ^^^^^
 >key : string
 >    : ^^^^^^
 >x : any
@@ -39,12 +39,12 @@
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"1" : string
 >    : ^^^^^^
->"one" : string
->      : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
 >"2" : string
 >    : ^^^^^^
->"two" : string
->      : ^^^^^^
+>"two" : "two"
+>      : ^^^^^
 >key : string
 >    : ^^^^^^
 >x : string
diff --git a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types
index f1febd083c2..50f0515376c 100644
--- a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types
+++ b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types
@@ -15,12 +15,12 @@
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"1" : string
 >    : ^^^^^^
->"one" : string
->      : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
 >"2" : string
 >    : ^^^^^^
->"two" : string
->      : ^^^^^^
+>"two" : "two"
+>      : ^^^^^
 >key : string
 >    : ^^^^^^
 >x : any
@@ -39,12 +39,12 @@
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"1" : string
 >    : ^^^^^^
->"one" : string
->      : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
 >"2" : string
 >    : ^^^^^^
->"two" : string
->      : ^^^^^^
+>"two" : "two"
+>      : ^^^^^
 >key : string
 >    : ^^^^^^
 >x : string
diff --git a/tests/baselines/reference/emitArrowFunctionES6.types b/tests/baselines/reference/emitArrowFunctionES6.types
index 43c77418557..472ea87102f 100644
--- a/tests/baselines/reference/emitArrowFunctionES6.types
+++ b/tests/baselines/reference/emitArrowFunctionES6.types
@@ -159,8 +159,8 @@ var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
 >         : ^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var p10 = ([{ value, done }]) => { };
 >p10 : ([{ value, done }]: [{ value: any; done: any; }]) => void
diff --git a/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.types b/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.types
index 7cdcdafe1a4..e8caea480cf 100644
--- a/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.types
+++ b/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.types
@@ -6,10 +6,10 @@ var array1: [number, number] = [1, 2];
 >       : ^^^^^^^^^^^^^^^^
 >[1, 2] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class B {
 >B : B
diff --git a/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.types b/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.types
index 70448afc116..5402a3b9574 100644
--- a/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.types
@@ -34,8 +34,8 @@ class B {
     x: string = "hello";
 >x : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     _bar: string;
 >_bar : string
@@ -52,16 +52,16 @@ class B {
 >     : ^^^^^
 
         this.y = 10;
->this.y = 10 : number
->            : ^^^^^^
+>this.y = 10 : 10
+>            : ^^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     baz(...args): string;
 >baz : (...args: any[]) => string
diff --git a/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.types b/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.types
index 278d3376ed7..4b550d75740 100644
--- a/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.types
@@ -90,10 +90,10 @@ class D extends C {
 >      : ^
 >baz : (a: string, y: number) => void
 >    : ^ ^^      ^^ ^^      ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
index eb0c1d755ad..7f477763893 100644
--- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
@@ -26,8 +26,8 @@ class C {
 >      : ^^^^^^
 
         return "BYE";
->"BYE" : string
->      : ^^^^^^
+>"BYE" : "BYE"
+>      : ^^^^^
     }
     static get ["computedname"]() {
 >["computedname"] : string
@@ -36,8 +36,8 @@ class C {
 >               : ^^^^^^^^^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     get ["computedname1"]() {
 >["computedname1"] : string
diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types
index 8996a718d35..aa15e4e61f7 100644
--- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types
@@ -34,8 +34,8 @@ class D {
 >                : ^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     bar(): string {
 >bar : () => string
@@ -57,8 +57,8 @@ class D {
 >  : ^^^^^^
 
         return "HELLO";
->"HELLO" : string
->        : ^^^^^^
+>"HELLO" : "HELLO"
+>        : ^^^^^^^
     }
     static ["computedname4"]() { }
 >["computedname4"] : () => void
@@ -113,6 +113,6 @@ class D {
 >    : ^ ^^      ^^^^^      
 >a : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.types b/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.types
index 2c620f77099..be9ae6d0e64 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.types
@@ -8,8 +8,8 @@ class C {
     x: string = "Hello world";
 >x : string
 >  : ^^^^^^
->"Hello world" : string
->              : ^^^^^^
+>"Hello world" : "Hello world"
+>              : ^^^^^^^^^^^^^
 }
 
 class D {
@@ -19,8 +19,8 @@ class D {
     x: string = "Hello world";
 >x : string
 >  : ^^^^^^
->"Hello world" : string
->              : ^^^^^^
+>"Hello world" : "Hello world"
+>              : ^^^^^^^^^^^^^
 
     y: number;
 >y : number
@@ -28,16 +28,16 @@ class D {
 
     constructor() {
         this.y = 10;
->this.y = 10 : number
->            : ^^^^^^
+>this.y = 10 : 10
+>            : ^^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 
@@ -78,15 +78,15 @@ class F extends D{
 >      : ^^^^^^^^
 
         this.j = "HI";
->this.j = "HI" : string
->              : ^^^^^^
+>this.j = "HI" : "HI"
+>              : ^^^^
 >this.j : string
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >j : string
 >  : ^^^^^^
->"HI" : string
->     : ^^^^^^
+>"HI" : "HI"
+>     : ^^^^
     }
 }
diff --git a/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.types b/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.types
index b48910ae120..2a28757a53a 100644
--- a/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.types
@@ -8,8 +8,8 @@ class C {
     static z: string = "Foo";
 >z : string
 >  : ^^^^^^
->"Foo" : string
->      : ^^^^^^
+>"Foo" : "Foo"
+>      : ^^^^^
 }
 
 class D {
diff --git a/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.types b/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.types
index a83f87b481a..09d8aa7601c 100644
--- a/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.types
@@ -13,16 +13,16 @@ class B {
 
     constructor() {
         this.x = 10;
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     static log(a: number) { }
 >log : (a: number) => void
diff --git a/tests/baselines/reference/emitClassMergedWithConstNamespaceNotElided.types b/tests/baselines/reference/emitClassMergedWithConstNamespaceNotElided.types
index 1b1d6b7a2cb..7586833e422 100644
--- a/tests/baselines/reference/emitClassMergedWithConstNamespaceNotElided.types
+++ b/tests/baselines/reference/emitClassMergedWithConstNamespaceNotElided.types
@@ -56,6 +56,6 @@ Clone.clone("ok");
 >      : ^^^^^^^^^^^^
 >clone : (url: string) => void
 >      : ^   ^^      ^^^^^    
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/emitDefaultParametersFunctionExpression.types b/tests/baselines/reference/emitDefaultParametersFunctionExpression.types
index 7189ea0b133..4763f9b8253 100644
--- a/tests/baselines/reference/emitDefaultParametersFunctionExpression.types
+++ b/tests/baselines/reference/emitDefaultParametersFunctionExpression.types
@@ -98,6 +98,6 @@ var z = (function (num: number, boo = false, ...rest) { })(10)
 >      : ^^^^^
 >rest : []
 >     : ^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.types b/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.types
index 24a53326644..651e6f4eb44 100644
--- a/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.types
+++ b/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.types
@@ -98,6 +98,6 @@ var z = (function (num: number, boo = false, ...rest) { })(10)
 >      : ^^^^^
 >rest : []
 >     : ^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/emitStatementsBeforeSuperCall.types b/tests/baselines/reference/emitStatementsBeforeSuperCall.types
index aa9e1529288..d702cd558e5 100644
--- a/tests/baselines/reference/emitStatementsBeforeSuperCall.types
+++ b/tests/baselines/reference/emitStatementsBeforeSuperCall.types
@@ -67,16 +67,16 @@ class Test extends Base {
 >      : ^^^^^^^^^^^
 
         this.prop = 1;
->this.prop = 1 : number
->              : ^^^^^^
+>this.prop = 1 : 1
+>              : ^
 >this.prop : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >prop : number
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/emitStatementsBeforeSuperCallWithDefineFields.types b/tests/baselines/reference/emitStatementsBeforeSuperCallWithDefineFields.types
index a5e8d5ad512..162a177469c 100644
--- a/tests/baselines/reference/emitStatementsBeforeSuperCallWithDefineFields.types
+++ b/tests/baselines/reference/emitStatementsBeforeSuperCallWithDefineFields.types
@@ -67,16 +67,16 @@ class Test extends Base {
 >      : ^^^^^^^^^^^
 
         this.prop = 1;
->this.prop = 1 : number
->              : ^^^^^^
+>this.prop = 1 : 1
+>              : ^
 >this.prop : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >prop : number
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=false).types b/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=false).types
index 614a6dd7557..b315aa5d683 100644
--- a/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=false).types
+++ b/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=false).types
@@ -189,8 +189,8 @@ const foo = (value: unknown): string => {
 >      : ^^^^^^^
 
       return 'foo';
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
   }
   if (value === 'xyz') {
 >value === 'xyz' : boolean
@@ -205,8 +205,8 @@ const foo = (value: unknown): string => {
 >      : ^^^^^
   }
   return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=true).types b/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=true).types
index af7522113c9..bf9516fda16 100644
--- a/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=true).types
+++ b/tests/baselines/reference/emptyAnonymousObjectNarrowing(strictnullchecks=true).types
@@ -189,8 +189,8 @@ const foo = (value: unknown): string => {
 >      : ^^^^^^^
 
       return 'foo';
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
   }
   if (value === 'xyz') {
 >value === 'xyz' : boolean
@@ -205,8 +205,8 @@ const foo = (value: unknown): string => {
 >      : ^^^^^
   }
   return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/emptyThenWarning.types b/tests/baselines/reference/emptyThenWarning.types
index 69ab6ece718..9d51fbee73f 100644
--- a/tests/baselines/reference/emptyThenWarning.types
+++ b/tests/baselines/reference/emptyThenWarning.types
@@ -20,10 +20,10 @@ if (true === true); {
 >     : ^^^^
 
     x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.types b/tests/baselines/reference/enumAssignabilityInInheritance.types
index d5637106ecb..d8fb673be94 100644
--- a/tests/baselines/reference/enumAssignabilityInInheritance.types
+++ b/tests/baselines/reference/enumAssignabilityInInheritance.types
@@ -60,8 +60,8 @@ var r2 = foo(1); // number
 >       : ^^^^^^
 >foo : { (x: E): E; (x: number): number; (x: any): any; }
 >    : ^^^ ^^ ^^^ ^^^ ^^      ^^^      ^^^ ^^   ^^^   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r3 = foo(<any>null); // any
 >r3 : any
diff --git a/tests/baselines/reference/enumClassification.types b/tests/baselines/reference/enumClassification.types
index 0d86a44ca17..e0eb8c4c75a 100644
--- a/tests/baselines/reference/enumClassification.types
+++ b/tests/baselines/reference/enumClassification.types
@@ -275,7 +275,7 @@ enum E20 {
 >     : ^^^^
 >sin : (x: number) => number
 >    : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
diff --git a/tests/baselines/reference/enumErrorOnConstantBindingWithInitializer.types b/tests/baselines/reference/enumErrorOnConstantBindingWithInitializer.types
index 1f1447643f8..d980d9405d6 100644
--- a/tests/baselines/reference/enumErrorOnConstantBindingWithInitializer.types
+++ b/tests/baselines/reference/enumErrorOnConstantBindingWithInitializer.types
@@ -18,8 +18,8 @@ declare const thing: Thing;
 const { value = "123" } = thing;
 >value : string | number
 >      : ^^^^^^^^^^^^^^^
->"123" : string
->      : ^^^^^^
+>"123" : "123"
+>      : ^^^^^
 >thing : Thing
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/enumLiteralTypes1.types b/tests/baselines/reference/enumLiteralTypes1.types
index 0e3c7d929a3..6e3d354d44a 100644
--- a/tests/baselines/reference/enumLiteralTypes1.types
+++ b/tests/baselines/reference/enumLiteralTypes1.types
@@ -421,8 +421,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function f10(x: YesNo) {
diff --git a/tests/baselines/reference/enumLiteralTypes2.types b/tests/baselines/reference/enumLiteralTypes2.types
index 6124cf3cdb9..fa51ba17cd3 100644
--- a/tests/baselines/reference/enumLiteralTypes2.types
+++ b/tests/baselines/reference/enumLiteralTypes2.types
@@ -421,8 +421,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function f10(x: YesNo) {
diff --git a/tests/baselines/reference/enumOperations.types b/tests/baselines/reference/enumOperations.types
index d4b82acf53b..b5ae5f01c83 100644
--- a/tests/baselines/reference/enumOperations.types
+++ b/tests/baselines/reference/enumOperations.types
@@ -22,8 +22,8 @@ var enumType: Enum = Enum.None;
 var numberType: number = 0;
 >numberType : number
 >           : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var anyType: any = 0;
 >anyType : any
diff --git a/tests/baselines/reference/enumTag.types b/tests/baselines/reference/enumTag.types
index 01eaff562c0..563141ae931 100644
--- a/tests/baselines/reference/enumTag.types
+++ b/tests/baselines/reference/enumTag.types
@@ -36,8 +36,8 @@ const Target = {
     OK_I_GUESS: 2
 >OK_I_GUESS : number
 >           : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 /** @enum number */
 const Second = {
@@ -62,8 +62,8 @@ const Second = {
     FINE: 2,
 >FINE : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 /** @enum {function(number): number} */
 const Fs = {
@@ -182,12 +182,12 @@ function consume(t,s,f) {
 >        : ^^^^^^
 
     v = 'something else' // allowed, like Typescript's classic enums and unlike its string enums
->v = 'something else' : string
->                     : ^^^^^^
+>v = 'something else' : "something else"
+>                     : ^^^^^^^^^^^^^^^^
 >v : string
 >  : ^^^^^^
->'something else' : string
->                 : ^^^^^^
+>'something else' : "something else"
+>                 : ^^^^^^^^^^^^^^^^
 }
 /** @param {string} s */
 function ff(s) {
diff --git a/tests/baselines/reference/enumTagImported.types b/tests/baselines/reference/enumTagImported.types
index 0149d642204..28428672677 100644
--- a/tests/baselines/reference/enumTagImported.types
+++ b/tests/baselines/reference/enumTagImported.types
@@ -6,15 +6,15 @@
 const test = 'add'
 >test : string
 >     : ^^^^^^
->'add' : string
->      : ^^^^^^
+>'add' : "add"
+>      : ^^^^^
 
 /** @type {import("./mod1").TestEnum} */
 const tost = 'remove'
 >tost : string
 >     : ^^^^^^
->'remove' : string
->         : ^^^^^^
+>'remove' : "remove"
+>         : ^^^^^^^^
 
 === value.js ===
 import { TestEnum } from "./mod1"
diff --git a/tests/baselines/reference/errorCause(target=es2021).types b/tests/baselines/reference/errorCause(target=es2021).types
index e9090b32437..b753ffa88ac 100644
--- a/tests/baselines/reference/errorCause(target=es2021).types
+++ b/tests/baselines/reference/errorCause(target=es2021).types
@@ -12,8 +12,8 @@ let err = new Error("foo", { cause: new Error("bar") });
 >                                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -22,8 +22,8 @@ let err = new Error("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 err.cause;
 >err.cause : any
@@ -40,8 +40,8 @@ let anotherErr = new Error("foo", { cause: a });
 >                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: a } : { cause: unknown; }
 >             : ^^^^^^^^^^^^^^^^^^^
 >cause : unknown
@@ -62,8 +62,8 @@ new EvalError("foo", { cause: new Error("bar") });
 >                                                  : ^^^^^^^^^^^^^^^^^
 >EvalError : EvalErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -72,16 +72,16 @@ new EvalError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new EvalError("foo", { cause: a });
 >new EvalError("foo", { cause: a }) : EvalError & Error
 >                                   : ^^^^^^^^^^^^^^^^^
 >EvalError : EvalErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: a } : { cause: unknown; }
 >             : ^^^^^^^^^^^^^^^^^^^
 >cause : unknown
@@ -94,8 +94,8 @@ new RangeError("foo", { cause: new Error("bar") });
 >                                                   : ^^^^^^^^^^^^^^^^^^
 >RangeError : RangeErrorConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -104,16 +104,16 @@ new RangeError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new ReferenceError("foo", { cause: new Error("bar") });
 >new ReferenceError("foo", { cause: new Error("bar") }) : ReferenceError & Error
 >                                                       : ^^^^^^^^^^^^^^^^^^^^^^
 >ReferenceError : ReferenceErrorConstructor
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -122,16 +122,16 @@ new ReferenceError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new SyntaxError("foo", { cause: new Error("bar") });
 >new SyntaxError("foo", { cause: new Error("bar") }) : SyntaxError & Error
 >                                                    : ^^^^^^^^^^^^^^^^^^^
 >SyntaxError : SyntaxErrorConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -140,16 +140,16 @@ new SyntaxError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new TypeError("foo", { cause: new Error("bar") });
 >new TypeError("foo", { cause: new Error("bar") }) : TypeError & Error
 >                                                  : ^^^^^^^^^^^^^^^^^
 >TypeError : TypeErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -158,16 +158,16 @@ new TypeError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new URIError("foo", { cause: new Error("bar") });
 >new URIError("foo", { cause: new Error("bar") }) : URIError & Error
 >                                                 : ^^^^^^^^^^^^^^^^
 >URIError : URIErrorConstructor
 >         : ^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -176,8 +176,8 @@ new URIError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new AggregateError([], "foo", { cause: new Error("bar") });
 >new AggregateError([], "foo", { cause: new Error("bar") }) : AggregateError
@@ -186,8 +186,8 @@ new AggregateError([], "foo", { cause: new Error("bar") });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -196,6 +196,6 @@ new AggregateError([], "foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/errorCause(target=es2022).types b/tests/baselines/reference/errorCause(target=es2022).types
index fbafad453d9..f34f355dbca 100644
--- a/tests/baselines/reference/errorCause(target=es2022).types
+++ b/tests/baselines/reference/errorCause(target=es2022).types
@@ -12,8 +12,8 @@ let err = new Error("foo", { cause: new Error("bar") });
 >                                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -22,8 +22,8 @@ let err = new Error("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 err.cause;
 >err.cause : unknown
@@ -40,8 +40,8 @@ let anotherErr = new Error("foo", { cause: a });
 >                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: a } : { cause: unknown; }
 >             : ^^^^^^^^^^^^^^^^^^^
 >cause : unknown
@@ -62,8 +62,8 @@ new EvalError("foo", { cause: new Error("bar") });
 >                                                  : ^^^^^^^^^
 >EvalError : EvalErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -72,16 +72,16 @@ new EvalError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new EvalError("foo", { cause: a });
 >new EvalError("foo", { cause: a }) : EvalError
 >                                   : ^^^^^^^^^
 >EvalError : EvalErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: a } : { cause: unknown; }
 >             : ^^^^^^^^^^^^^^^^^^^
 >cause : unknown
@@ -94,8 +94,8 @@ new RangeError("foo", { cause: new Error("bar") });
 >                                                   : ^^^^^^^^^^
 >RangeError : RangeErrorConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -104,16 +104,16 @@ new RangeError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new ReferenceError("foo", { cause: new Error("bar") });
 >new ReferenceError("foo", { cause: new Error("bar") }) : ReferenceError
 >                                                       : ^^^^^^^^^^^^^^
 >ReferenceError : ReferenceErrorConstructor
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -122,16 +122,16 @@ new ReferenceError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new SyntaxError("foo", { cause: new Error("bar") });
 >new SyntaxError("foo", { cause: new Error("bar") }) : SyntaxError
 >                                                    : ^^^^^^^^^^^
 >SyntaxError : SyntaxErrorConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -140,16 +140,16 @@ new SyntaxError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new TypeError("foo", { cause: new Error("bar") });
 >new TypeError("foo", { cause: new Error("bar") }) : TypeError
 >                                                  : ^^^^^^^^^
 >TypeError : TypeErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -158,16 +158,16 @@ new TypeError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new URIError("foo", { cause: new Error("bar") });
 >new URIError("foo", { cause: new Error("bar") }) : URIError
 >                                                 : ^^^^^^^^
 >URIError : URIErrorConstructor
 >         : ^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -176,8 +176,8 @@ new URIError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new AggregateError([], "foo", { cause: new Error("bar") });
 >new AggregateError([], "foo", { cause: new Error("bar") }) : AggregateError
@@ -186,8 +186,8 @@ new AggregateError([], "foo", { cause: new Error("bar") });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -196,6 +196,6 @@ new AggregateError([], "foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/errorCause(target=esnext).types b/tests/baselines/reference/errorCause(target=esnext).types
index fbafad453d9..f34f355dbca 100644
--- a/tests/baselines/reference/errorCause(target=esnext).types
+++ b/tests/baselines/reference/errorCause(target=esnext).types
@@ -12,8 +12,8 @@ let err = new Error("foo", { cause: new Error("bar") });
 >                                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -22,8 +22,8 @@ let err = new Error("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 err.cause;
 >err.cause : unknown
@@ -40,8 +40,8 @@ let anotherErr = new Error("foo", { cause: a });
 >                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: a } : { cause: unknown; }
 >             : ^^^^^^^^^^^^^^^^^^^
 >cause : unknown
@@ -62,8 +62,8 @@ new EvalError("foo", { cause: new Error("bar") });
 >                                                  : ^^^^^^^^^
 >EvalError : EvalErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -72,16 +72,16 @@ new EvalError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new EvalError("foo", { cause: a });
 >new EvalError("foo", { cause: a }) : EvalError
 >                                   : ^^^^^^^^^
 >EvalError : EvalErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: a } : { cause: unknown; }
 >             : ^^^^^^^^^^^^^^^^^^^
 >cause : unknown
@@ -94,8 +94,8 @@ new RangeError("foo", { cause: new Error("bar") });
 >                                                   : ^^^^^^^^^^
 >RangeError : RangeErrorConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -104,16 +104,16 @@ new RangeError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new ReferenceError("foo", { cause: new Error("bar") });
 >new ReferenceError("foo", { cause: new Error("bar") }) : ReferenceError
 >                                                       : ^^^^^^^^^^^^^^
 >ReferenceError : ReferenceErrorConstructor
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -122,16 +122,16 @@ new ReferenceError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new SyntaxError("foo", { cause: new Error("bar") });
 >new SyntaxError("foo", { cause: new Error("bar") }) : SyntaxError
 >                                                    : ^^^^^^^^^^^
 >SyntaxError : SyntaxErrorConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -140,16 +140,16 @@ new SyntaxError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new TypeError("foo", { cause: new Error("bar") });
 >new TypeError("foo", { cause: new Error("bar") }) : TypeError
 >                                                  : ^^^^^^^^^
 >TypeError : TypeErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -158,16 +158,16 @@ new TypeError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new URIError("foo", { cause: new Error("bar") });
 >new URIError("foo", { cause: new Error("bar") }) : URIError
 >                                                 : ^^^^^^^^
 >URIError : URIErrorConstructor
 >         : ^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -176,8 +176,8 @@ new URIError("foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 new AggregateError([], "foo", { cause: new Error("bar") });
 >new AggregateError([], "foo", { cause: new Error("bar") }) : AggregateError
@@ -186,8 +186,8 @@ new AggregateError([], "foo", { cause: new Error("bar") });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ cause: new Error("bar") } : { cause: Error; }
 >                            : ^^^^^^^^^^^^^^^^^
 >cause : Error
@@ -196,6 +196,6 @@ new AggregateError([], "foo", { cause: new Error("bar") });
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.types b/tests/baselines/reference/errorForConflictingExportEqualsValue.types
index fe51da853d3..2e8167128f3 100644
--- a/tests/baselines/reference/errorForConflictingExportEqualsValue.types
+++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.types
@@ -12,6 +12,6 @@ export = x;
 import("./a");
 >import("./a") : Promise<any>
 >              : ^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.types b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.types
index 4a61c45970e..b94f92667f1 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.types
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.types
@@ -22,8 +22,8 @@ function f() {
 >               : ^^^^^^^
 >derived : typeof derived
 >        : ^^^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 }
 
 class base { constructor(public n: number) { } }
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes01.types b/tests/baselines/reference/errorMessagesIntersectionTypes01.types
index 148446ce716..bbbc17ff275 100644
--- a/tests/baselines/reference/errorMessagesIntersectionTypes01.types
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes01.types
@@ -35,7 +35,7 @@ let fooBar: FooBar = mixBar({
     fooProp: "frizzlebizzle"
 >fooProp : string
 >        : ^^^^^^
->"frizzlebizzle" : string
->                : ^^^^^^
+>"frizzlebizzle" : "frizzlebizzle"
+>                : ^^^^^^^^^^^^^^^
 
 });
diff --git a/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types
index 338d6ebae52..46c3c35a3a4 100644
--- a/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types
+++ b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types
@@ -5,7 +5,7 @@ interface Foo {
     bar: number = 5;
 >bar : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 }
 
diff --git a/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.types b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.types
index 9fdf6d08190..ca38fc7398d 100644
--- a/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.types
+++ b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.types
@@ -8,8 +8,8 @@ var Foo: {
     bar: number = 5;
 >bar : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 };
 
@@ -20,8 +20,8 @@ let Bar: {
     bar: number = 5;
 >bar : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 };
 
diff --git a/tests/baselines/reference/errorSuperPropertyAccess.types b/tests/baselines/reference/errorSuperPropertyAccess.types
index 7adc58a9ead..851e536a28d 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.types
+++ b/tests/baselines/reference/errorSuperPropertyAccess.types
@@ -212,16 +212,16 @@ class SomeDerived1 extends SomeBase {
 >      : ^^^^^^^^^^^^^^^
 
         super.publicMember = 1;
->super.publicMember = 1 : number
->                       : ^^^^^^
+>super.publicMember = 1 : 1
+>                       : ^
 >super.publicMember : number
 >                   : ^^^^^^
 >super : SomeBase
 >      : ^^^^^^^^
 >publicMember : number
 >             : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     fn() {
@@ -333,16 +333,16 @@ class SomeDerived2 extends SomeBase {
 >      : ^^^^^^^^^^^^^^^
 
         super.privateMember = 1;
->super.privateMember = 1 : number
->                        : ^^^^^^
+>super.privateMember = 1 : 1
+>                        : ^
 >super.privateMember : number
 >                    : ^^^^^^
 >super : SomeBase
 >      : ^^^^^^^^
 >privateMember : number
 >              : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     fn() {
@@ -413,28 +413,28 @@ class SomeDerived3 extends SomeBase {
 >   : ^^^^^^^^^^
 
         super.publicStaticMember = 3;
->super.publicStaticMember = 3 : number
->                             : ^^^^^^
+>super.publicStaticMember = 3 : 3
+>                             : ^
 >super.publicStaticMember : number
 >                         : ^^^^^^
 >super : typeof SomeBase
 >      : ^^^^^^^^^^^^^^^
 >publicStaticMember : number
 >                   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super.privateStaticMember = 3;
->super.privateStaticMember = 3 : number
->                              : ^^^^^^
+>super.privateStaticMember = 3 : 3
+>                              : ^
 >super.privateStaticMember : number
 >                          : ^^^^^^
 >super : typeof SomeBase
 >      : ^^^^^^^^^^^^^^^
 >privateStaticMember : number
 >                    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super.privateStaticFunc();
 >super.privateStaticFunc() : void
@@ -451,28 +451,28 @@ class SomeDerived3 extends SomeBase {
 >  : ^^^^^^
 
         super.publicStaticMember = 3;
->super.publicStaticMember = 3 : number
->                             : ^^^^^^
+>super.publicStaticMember = 3 : 3
+>                             : ^
 >super.publicStaticMember : number
 >                         : ^^^^^^
 >super : typeof SomeBase
 >      : ^^^^^^^^^^^^^^^
 >publicStaticMember : number
 >                   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super.privateStaticMember = 3;
->super.privateStaticMember = 3 : number
->                              : ^^^^^^
+>super.privateStaticMember = 3 : 3
+>                              : ^
 >super.privateStaticMember : number
 >                          : ^^^^^^
 >super : typeof SomeBase
 >      : ^^^^^^^^^^^^^^^
 >privateStaticMember : number
 >                    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super.privateStaticFunc();
 >super.privateStaticFunc() : void
@@ -495,28 +495,28 @@ class SomeDerived3 extends SomeBase {
 >  : ^^^^^^
 
         super.publicStaticMember = 3;
->super.publicStaticMember = 3 : number
->                             : ^^^^^^
+>super.publicStaticMember = 3 : 3
+>                             : ^
 >super.publicStaticMember : number
 >                         : ^^^^^^
 >super : typeof SomeBase
 >      : ^^^^^^^^^^^^^^^
 >publicStaticMember : number
 >                   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super.privateStaticMember = 3;
->super.privateStaticMember = 3 : number
->                              : ^^^^^^
+>super.privateStaticMember = 3 : 3
+>                              : ^
 >super.privateStaticMember : number
 >                          : ^^^^^^
 >super : typeof SomeBase
 >      : ^^^^^^^^^^^^^^^
 >privateStaticMember : number
 >                    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         super.privateStaticFunc();
 >super.privateStaticFunc() : void
diff --git a/tests/baselines/reference/errorsOnUnionsOfOverlappingObjects01.types b/tests/baselines/reference/errorsOnUnionsOfOverlappingObjects01.types
index 89d71b663ea..58514696106 100644
--- a/tests/baselines/reference/errorsOnUnionsOfOverlappingObjects01.types
+++ b/tests/baselines/reference/errorsOnUnionsOfOverlappingObjects01.types
@@ -61,12 +61,12 @@ f({ a: '', b: '' })
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 declare function g(x: Bar | Other): any;
 >g : (x: Bar | Other) => any
@@ -95,8 +95,8 @@ g({ a: '', b: '' })
 >   : ^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 declare function h(x: Foo | Bar | Other): any;
 >h : (x: Foo | Bar | Other) => any
@@ -121,12 +121,12 @@ h({ a: '', b: '' })
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 interface CatDog { cat: any, dog: any }
 >cat : any
diff --git a/tests/baselines/reference/es2016IntlAPIs.types b/tests/baselines/reference/es2016IntlAPIs.types
index 25211e86590..298aa60b23e 100644
--- a/tests/baselines/reference/es2016IntlAPIs.types
+++ b/tests/baselines/reference/es2016IntlAPIs.types
@@ -44,10 +44,10 @@ console.log(Intl.getCanonicalLocales(['EN-US', 'Fr']));
 >                    : ^      ^^^                          ^^^^^        
 >['EN-US', 'Fr'] : string[]
 >                : ^^^^^^^^
->'EN-US' : string
->        : ^^^^^^
->'Fr' : string
->     : ^^^^^^
+>'EN-US' : "EN-US"
+>        : ^^^^^^^
+>'Fr' : "Fr"
+>     : ^^^^
 
 // Expected output: Array ["en-US", "fr"]
 
diff --git a/tests/baselines/reference/es2017DateAPIs.types b/tests/baselines/reference/es2017DateAPIs.types
index ce1d69afb92..b8a70710a0a 100644
--- a/tests/baselines/reference/es2017DateAPIs.types
+++ b/tests/baselines/reference/es2017DateAPIs.types
@@ -10,6 +10,6 @@ Date.UTC(2017);
 >     : ^^^^^^^^^^^^^^^
 >UTC : { (year: number, monthIndex: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; (year: number, monthIndex?: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; }
 >    : ^^^    ^^      ^^          ^^      ^^    ^^^      ^^     ^^^      ^^       ^^^      ^^       ^^^      ^^  ^^^      ^^^      ^^^    ^^      ^^          ^^^      ^^    ^^^      ^^     ^^^      ^^       ^^^      ^^       ^^^      ^^  ^^^      ^^^      ^^^
->2017 : number
->     : ^^^^^^
+>2017 : 2017
+>     : ^^^^
 
diff --git a/tests/baselines/reference/es2018IntlAPIs.types b/tests/baselines/reference/es2018IntlAPIs.types
index 2765e19fa7e..8b70d19421d 100644
--- a/tests/baselines/reference/es2018IntlAPIs.types
+++ b/tests/baselines/reference/es2018IntlAPIs.types
@@ -58,8 +58,8 @@ console.log(Intl.PluralRules.supportedLocalesOf(locales, options).join(', '));
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->', ' : string
->     : ^^^^^^
+>', ' : ", "
+>     : ^^^^
 
 const [ part ] = new Intl.NumberFormat().formatToParts();
 >part : Intl.NumberFormatPart
diff --git a/tests/baselines/reference/es2020IntlAPIs.types b/tests/baselines/reference/es2020IntlAPIs.types
index b2d1cabc593..b43ea99323f 100644
--- a/tests/baselines/reference/es2020IntlAPIs.types
+++ b/tests/baselines/reference/es2020IntlAPIs.types
@@ -82,8 +82,8 @@ log("en-US");
 >             : ^^^^
 >log : (locale: string) => void
 >    : ^      ^^      ^^^^^^^^^
->"en-US" : string
->        : ^^^^^^
+>"en-US" : "en-US"
+>        : ^^^^^^^
 
 // expected output: 5/24/2012 26,254.39
 
@@ -92,8 +92,8 @@ log("de-DE");
 >             : ^^^^
 >log : (locale: string) => void
 >    : ^      ^^      ^^^^^^^^^
->"de-DE" : string
->        : ^^^^^^
+>"de-DE" : "de-DE"
+>        : ^^^^^^^
 
 // expected output: 24.5.2012 26.254,39
 
@@ -135,8 +135,8 @@ console.log(rtf1.format(3, 'quarter'));
 >     : ^^^^^^^^^^^^^^^^^^^^^^^
 >format : (value: number, unit: Intl.RelativeTimeFormatUnit) => string
 >       : ^     ^^      ^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >'quarter' : "quarter"
 >          : ^^^^^^^^^
 
@@ -205,8 +205,8 @@ console.log(rtf2.format(2, 'day'));
 >     : ^^^^^^^^^^^^^^^^^^^^^^^
 >format : (value: number, unit: Intl.RelativeTimeFormatUnit) => string
 >       : ^     ^^      ^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >'day' : "day"
 >      : ^^^^^
 
@@ -274,8 +274,8 @@ console.log(regionNamesInEnglish.of('US'));
 >                     : ^^^^^^^^^^^^^^^^^
 >of : (code: string) => string | undefined
 >   : ^    ^^      ^^^^^                  
->'US' : string
->     : ^^^^^^
+>'US' : "US"
+>     : ^^^^
 
 // expected output: "United States"
 
@@ -296,8 +296,8 @@ console.log(regionNamesInTraditionalChinese.of('US'));
 >                                : ^^^^^^^^^^^^^^^^^
 >of : (code: string) => string | undefined
 >   : ^    ^^      ^^^^^                  
->'US' : string
->     : ^^^^^^
+>'US' : "US"
+>     : ^^^^
 
 // expected output: "美國"
 
@@ -356,8 +356,8 @@ console.log(Intl.DisplayNames.supportedLocalesOf(locales1, options1).join(', '))
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->', ' : string
->     : ^^^^^^
+>', ' : ", "
+>     : ^^^^
 
 new Intl.Locale(); // should error
 >new Intl.Locale() : Intl.Locale
@@ -458,8 +458,8 @@ console.log((new Intl.DisplayNames(undefined, {type: 'language'})).of('en-GB'));
 >           : ^^^^^^^^^^
 >of : (code: string) => string | undefined
 >   : ^    ^^      ^^^^^                  
->'en-GB' : string
->        : ^^^^^^
+>'en-GB' : "en-GB"
+>        : ^^^^^^^
 
 const localesArg = ["es-ES", new Intl.Locale("en-US")];
 >localesArg : (string | Intl.Locale)[]
diff --git a/tests/baselines/reference/es2022IntlAPIs.types b/tests/baselines/reference/es2022IntlAPIs.types
index bb0e295229a..2571a4c18b5 100644
--- a/tests/baselines/reference/es2022IntlAPIs.types
+++ b/tests/baselines/reference/es2022IntlAPIs.types
@@ -47,8 +47,8 @@ for (const zoneName of timezoneNames) {
     timeZone: 'America/Los_Angeles',
 >timeZone : string
 >         : ^^^^^^
->'America/Los_Angeles' : string
->                      : ^^^^^^
+>'America/Los_Angeles' : "America/Los_Angeles"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
     timeZoneName: zoneName,
 >timeZoneName : "short" | "long" | "shortOffset" | "longOffset" | "shortGeneric" | "longGeneric"
diff --git a/tests/baselines/reference/es2022SharedMemory.types b/tests/baselines/reference/es2022SharedMemory.types
index f77cf48bb8f..134a43a0dda 100644
--- a/tests/baselines/reference/es2022SharedMemory.types
+++ b/tests/baselines/reference/es2022SharedMemory.types
@@ -70,10 +70,10 @@ const waitValue = Atomics.wait(int32, 0, 0);
 >     : ^^^          ^^          ^^     ^^      ^^     ^^      ^^       ^^^      ^^^                                ^^^          ^^             ^^     ^^      ^^     ^^      ^^       ^^^      ^^^                                ^^^
 >int32 : Int32Array
 >      : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 const { async, value } = Atomics.waitAsync(int32, 0, 0);
 >async : boolean
@@ -90,10 +90,10 @@ const { async, value } = Atomics.waitAsync(int32, 0, 0);
 >          : ^^^          ^^          ^^     ^^      ^^     ^^      ^^       ^^^      ^^^                                                                                                          ^^^          ^^             ^^     ^^      ^^     ^^      ^^       ^^^      ^^^                                                                                                          ^^^
 >int32 : Int32Array
 >      : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 const { async: async64, value: value64 } = Atomics.waitAsync(int64, 0, BigInt(0));
 >async : any
@@ -114,8 +114,8 @@ const { async: async64, value: value64 } = Atomics.waitAsync(int64, 0, BigInt(0)
 >          : ^^^          ^^          ^^     ^^      ^^     ^^      ^^       ^^^      ^^^                                                                                                          ^^^          ^^             ^^     ^^      ^^     ^^      ^^       ^^^      ^^^                                                                                                          ^^^
 >int64 : BigInt64Array
 >      : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >BigInt(0) : bigint
 >          : ^^^^^^
 >BigInt : BigIntConstructor
diff --git a/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral.types b/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral.types
index 36d161d0b90..f748106248d 100644
--- a/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral.types
+++ b/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral.types
@@ -26,8 +26,8 @@ const fooShort = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         b: await Promise.resolve(1),
 >b : number
@@ -42,8 +42,8 @@ const fooShort = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         c: await Promise.resolve(2),
 >c : number
@@ -58,8 +58,8 @@ const fooShort = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         d: await Promise.resolve(3),
 >d : number
@@ -74,8 +74,8 @@ const fooShort = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         e: await Promise.resolve(4),
 >e : number
@@ -90,8 +90,8 @@ const fooShort = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
     };
 }
@@ -119,8 +119,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         b: await Promise.resolve(1),
 >b : number
@@ -135,8 +135,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         c: await Promise.resolve(2),
 >c : number
@@ -151,8 +151,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         d: await Promise.resolve(3),
 >d : number
@@ -167,8 +167,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         e: await Promise.resolve(4),
 >e : number
@@ -183,8 +183,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
         f: await Promise.resolve(5),
 >f : number
@@ -199,8 +199,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
         g: await Promise.resolve(6),
 >g : number
@@ -215,8 +215,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
         h: await Promise.resolve(7),
 >h : number
@@ -231,8 +231,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
         i: await Promise.resolve(8),
 >i : number
@@ -247,8 +247,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->8 : number
->  : ^^^^^^
+>8 : 8
+>  : ^
 
         j: await Promise.resolve(9),
 >j : number
@@ -263,8 +263,8 @@ const fooLong = async () => {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     };
 }
diff --git a/tests/baselines/reference/es5DateAPIs.types b/tests/baselines/reference/es5DateAPIs.types
index c4b448064a4..6642dddc014 100644
--- a/tests/baselines/reference/es5DateAPIs.types
+++ b/tests/baselines/reference/es5DateAPIs.types
@@ -10,6 +10,6 @@ Date.UTC(2017); // should error
 >     : ^^^^^^^^^^^^^^^
 >UTC : (year: number, monthIndex: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number) => number
 >    : ^    ^^      ^^          ^^      ^^    ^^^      ^^     ^^^      ^^       ^^^      ^^       ^^^      ^^  ^^^      ^^^^^      
->2017 : number
->     : ^^^^^^
+>2017 : 2017
+>     : ^^^^
 
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.types b/tests/baselines/reference/es6ClassSuperCodegenBug.types
index 12b275b710f..0f2153eb099 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.types
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.types
@@ -27,10 +27,10 @@ class B extends A {
 >                  : ^^^^
 >super : typeof A
 >      : ^^^^^^^^
->'a1' : string
->     : ^^^^^^
->'b1' : string
->     : ^^^^^^
+>'a1' : "a1"
+>     : ^^^^
+>'b1' : "b1"
+>     : ^^^^
 
 	    } else {
 	        super('a2', 'b2');
@@ -38,10 +38,10 @@ class B extends A {
 >                  : ^^^^
 >super : typeof A
 >      : ^^^^^^^^
->'a2' : string
->     : ^^^^^^
->'b2' : string
->     : ^^^^^^
+>'a2' : "a2"
+>     : ^^^^
+>'b2' : "b2"
+>     : ^^^^
 	    }
     }
 }
diff --git a/tests/baselines/reference/es6ClassTest.types b/tests/baselines/reference/es6ClassTest.types
index 513a9843266..8ccc78af184 100644
--- a/tests/baselines/reference/es6ClassTest.types
+++ b/tests/baselines/reference/es6ClassTest.types
@@ -45,8 +45,8 @@ class Foo  extends Bar {
 	zoo:string = "zoo";
 >zoo : string
 >    : ^^^^^^
->"zoo" : string
->      : ^^^^^^
+>"zoo" : "zoo"
+>      : ^^^^^
 
 	x: any;
 >x : any
@@ -108,16 +108,16 @@ class Foo  extends Bar {
 >  : ^^^
 
         this.gar = 5;
->this.gar = 5 : number
->             : ^^^^^^
+>this.gar = 5 : 5
+>             : ^
 >this.gar : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
 >gar : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 	 }
 }
 
diff --git a/tests/baselines/reference/es6ClassTest2.types b/tests/baselines/reference/es6ClassTest2.types
index 550f23da769..0c12479039a 100644
--- a/tests/baselines/reference/es6ClassTest2.types
+++ b/tests/baselines/reference/es6ClassTest2.types
@@ -35,10 +35,10 @@ var m1 = new BasicMonster("1", 100);
 >                           : ^^^^^^^^^^^^
 >BasicMonster : typeof BasicMonster
 >             : ^^^^^^^^^^^^^^^^^^^
->"1" : string
->    : ^^^^^^
->100 : number
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
+>100 : 100
+>    : ^^^
 
 var m2 = new BasicMonster("2", 100);
 >m2 : BasicMonster
@@ -47,10 +47,10 @@ var m2 = new BasicMonster("2", 100);
 >                           : ^^^^^^^^^^^^
 >BasicMonster : typeof BasicMonster
 >             : ^^^^^^^^^^^^^^^^^^^
->"2" : string
->    : ^^^^^^
->100 : number
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
+>100 : 100
+>    : ^^^
 
 m1.attack(m2);
 >m1.attack(m2) : void
@@ -65,16 +65,16 @@ m1.attack(m2);
 >   : ^^^^^^^^^^^^
 
 m1.health = 0;
->m1.health = 0 : number
->              : ^^^^^^
+>m1.health = 0 : 0
+>              : ^
 >m1.health : number
 >          : ^^^^^^
 >m1 : BasicMonster
 >   : ^^^^^^^^^^^^
 >health : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 console.log((<any>m5.isAlive).toString());
 >console.log((<any>m5.isAlive).toString()) : void
@@ -158,8 +158,8 @@ class GetSetMonster {
 >                                          : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Health must be non-negative.' : string
->                               : ^^^^^^
+>'Health must be non-negative.' : "Health must be non-negative."
+>                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
         this._health = value
 >this._health = value : number
@@ -182,10 +182,10 @@ var m3 = new BasicMonster("1", 100);
 >                           : ^^^^^^^^^^^^
 >BasicMonster : typeof BasicMonster
 >             : ^^^^^^^^^^^^^^^^^^^
->"1" : string
->    : ^^^^^^
->100 : number
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
+>100 : 100
+>    : ^^^
 
 var m4 = new BasicMonster("2", 100);
 >m4 : BasicMonster
@@ -194,10 +194,10 @@ var m4 = new BasicMonster("2", 100);
 >                           : ^^^^^^^^^^^^
 >BasicMonster : typeof BasicMonster
 >             : ^^^^^^^^^^^^^^^^^^^
->"2" : string
->    : ^^^^^^
->100 : number
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
+>100 : 100
+>    : ^^^
 
 m3.attack(m4);
 >m3.attack(m4) : void
@@ -212,16 +212,16 @@ m3.attack(m4);
 >   : ^^^^^^^^^^^^
 
 m3.health = 0;
->m3.health = 0 : number
->              : ^^^^^^
+>m3.health = 0 : 0
+>              : ^
 >m3.health : number
 >          : ^^^^^^
 >m3 : BasicMonster
 >   : ^^^^^^^^^^^^
 >health : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var x = (<any>m5.isAlive).toString()
 >x : any
@@ -286,8 +286,8 @@ var m5 = new OverloadedMonster("1");
 >                           : ^^^^^^^^^^^^^^^^^
 >OverloadedMonster : typeof OverloadedMonster
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
 var m6 = new OverloadedMonster("2");
 >m6 : OverloadedMonster
@@ -296,8 +296,8 @@ var m6 = new OverloadedMonster("2");
 >                           : ^^^^^^^^^^^^^^^^^
 >OverloadedMonster : typeof OverloadedMonster
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
 m5.attack(m6);
 >m5.attack(m6) : any
@@ -311,16 +311,16 @@ m5.attack(m6);
 >   : ^^^^^^^^^^^^^^^^^
 
 m5.health = 0;
->m5.health = 0 : number
->              : ^^^^^^
+>m5.health = 0 : 0
+>              : ^
 >m5.health : number
 >          : ^^^^^^
 >m5 : OverloadedMonster
 >   : ^^^^^^^^^^^^^^^^^
 >health : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var y = (<any>m5.isAlive).toString()
 >y : any
@@ -369,8 +369,8 @@ class PrototypeMonster {
     age: number = 1;
 >age : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     name: string;
 >name : string
@@ -422,8 +422,8 @@ class SuperChild extends SuperParent {
 >         : ^^^^
 >super : typeof SuperParent
 >      : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     b() {
@@ -439,8 +439,8 @@ class SuperChild extends SuperParent {
 >      : ^^^^^^^^^^^
 >b : (b: string) => void
 >  : ^ ^^      ^^^^^^^^^
->'str' : string
->      : ^^^^^^
+>'str' : "str"
+>      : ^^^^^
     }
 
     c() {
@@ -515,28 +515,28 @@ class ImplementsInterface implements IFoo {
 
     constructor() {
         this.x = 1;
->this.x = 1 : number
->           : ^^^^^^
+>this.x = 1 : 1
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.z = "foo";
->this.z = "foo" : string
->               : ^^^^^^
+>this.z = "foo" : "foo"
+>               : ^^^^^
 >this.z : string
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >z : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
     }
 }
 
@@ -566,28 +566,28 @@ class Visibility {
 
     constructor() {
         this.x = 1;
->this.x = 1 : number
->           : ^^^^^^
+>this.x = 1 : 1
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.y = 2;
->this.y = 2 : number
->           : ^^^^^^
+>this.y = 2 : 2
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
@@ -617,9 +617,9 @@ var ccwc = new ChildClassWithoutConstructor(1, "s");
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ChildClassWithoutConstructor : typeof ChildClassWithoutConstructor
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"s" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"s" : "s"
+>    : ^^^
 
 
diff --git a/tests/baselines/reference/es6ClassTest3.types b/tests/baselines/reference/es6ClassTest3.types
index fc925109ae8..cfd2a2a20aa 100644
--- a/tests/baselines/reference/es6ClassTest3.types
+++ b/tests/baselines/reference/es6ClassTest3.types
@@ -31,28 +31,28 @@ module M {
 
 	    constructor() {
 	        this.x = 1;
->this.x = 1 : number
->           : ^^^^^^
+>this.x = 1 : 1
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 	        this.y = 2;
->this.y = 2 : number
->           : ^^^^^^
+>this.y = 2 : 2
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 	    }
 	}
 }
diff --git a/tests/baselines/reference/es6ClassTest8.types b/tests/baselines/reference/es6ClassTest8.types
index 2bc158b44b3..905a6a75464 100644
--- a/tests/baselines/reference/es6ClassTest8.types
+++ b/tests/baselines/reference/es6ClassTest8.types
@@ -122,14 +122,14 @@ class Camera {
 >                           : ^^^^^^
 >Vector : typeof Vector
 >       : ^^^^^^^^^^^^^
->0.0 : number
->    : ^^^^^^
+>0.0 : 0
+>    : ^
 >-1.0 : -1
 >     : ^^
 >1.0 : 1
 >    : ^
->0.0 : number
->    : ^^^^^^
+>0.0 : 0
+>    : ^
 
         this.forward = Vector.norm(Vector.minus(lookAt,this.pos));
 >this.forward = Vector.norm(Vector.minus(lookAt,this.pos)) : Vector
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.types b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.types
index e54b2a76bcb..c9dde324ff1 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.types
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.types
@@ -8,12 +8,12 @@ var foo = 2;
 >  : ^
 
 foo = 3;
->foo = 3 : number
->        : ^^^^^^
+>foo = 3 : 3
+>        : ^
 >foo : number
 >    : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var baz = 3;
 >baz : number
@@ -22,12 +22,12 @@ var baz = 3;
 >  : ^
 
 baz = 4;
->baz = 4 : number
->        : ^^^^^^
+>baz = 4 : 4
+>        : ^
 >baz : number
 >    : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var buzz = 10;
 >buzz : number
diff --git a/tests/baselines/reference/es6MemberScoping.types b/tests/baselines/reference/es6MemberScoping.types
index e8bbc30695e..377a74c8663 100644
--- a/tests/baselines/reference/es6MemberScoping.types
+++ b/tests/baselines/reference/es6MemberScoping.types
@@ -39,8 +39,8 @@ class Foo2 {
   static Foo2():number { return 0; } // should not be an error
 >Foo2 : () => number
 >     : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
  
 }
 
diff --git a/tests/baselines/reference/es6UseOfTopLevelRequire.types b/tests/baselines/reference/es6UseOfTopLevelRequire.types
index 552b546eead..253adb541dc 100644
--- a/tests/baselines/reference/es6UseOfTopLevelRequire.types
+++ b/tests/baselines/reference/es6UseOfTopLevelRequire.types
@@ -10,8 +10,8 @@ require("arg");
 >               : ^^^^
 >require : (s: string) => void
 >        : ^ ^^      ^^^^^    
->"arg" : string
->      : ^^^^^^
+>"arg" : "arg"
+>      : ^^^^^
 
 import exports from "./c"
 >exports : 0
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).types b/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).types
index 355ec148d64..0584dc4fcdf 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).types
+++ b/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).types
@@ -33,8 +33,8 @@ class C {
     get x() { return 1; }
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     @dec
 >dec : any
@@ -91,8 +91,8 @@ class C {
     static get #x() { return 1; }
 >#x : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     @dec
 >dec : any
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).types b/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).types
index 355ec148d64..0584dc4fcdf 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).types
+++ b/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).types
@@ -33,8 +33,8 @@ class C {
     get x() { return 1; }
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     @dec
 >dec : any
@@ -91,8 +91,8 @@ class C {
     static get #x() { return 1; }
 >#x : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     @dec
 >dec : any
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=esnext).types b/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=esnext).types
index 355ec148d64..0584dc4fcdf 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=esnext).types
+++ b/tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=esnext).types
@@ -33,8 +33,8 @@ class C {
     get x() { return 1; }
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     @dec
 >dec : any
@@ -91,8 +91,8 @@ class C {
     static get #x() { return 1; }
 >#x : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     @dec
 >dec : any
diff --git a/tests/baselines/reference/esDecorators-contextualTypes.2.types b/tests/baselines/reference/esDecorators-contextualTypes.2.types
index 2fde317a0f4..8e662b83fdc 100644
--- a/tests/baselines/reference/esDecorators-contextualTypes.2.types
+++ b/tests/baselines/reference/esDecorators-contextualTypes.2.types
@@ -10,8 +10,8 @@ class C {
 >                                           : ^      ^^^    ^^^^^^^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^
 >boundMethodLogger : <This, Args extends any[], Return>(source: string, bound?: boolean) => (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => ((this: This, ...args: Args) => Return)
 >                  : ^    ^^    ^^^^^^^^^     ^^      ^^      ^^      ^^     ^^^^^^^^^^^^^^^^      ^^                                     ^^       ^^                                                                        ^^^^^                                       
->"Yadda" : string
->        : ^^^^^^
+>"Yadda" : "Yadda"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/esModuleInteropDefaultMemberMustBeSyntacticallyDefaultExport.types b/tests/baselines/reference/esModuleInteropDefaultMemberMustBeSyntacticallyDefaultExport.types
index ffbb1b0067f..6f545b10b51 100644
--- a/tests/baselines/reference/esModuleInteropDefaultMemberMustBeSyntacticallyDefaultExport.types
+++ b/tests/baselines/reference/esModuleInteropDefaultMemberMustBeSyntacticallyDefaultExport.types
@@ -46,8 +46,8 @@ const p = new C(1, 2);
 >            : ^^^^^
 >C : typeof Point
 >  : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/esModuleInteropImportCall.types b/tests/baselines/reference/esModuleInteropImportCall.types
index d508d4debaa..eaf2af09696 100644
--- a/tests/baselines/reference/esModuleInteropImportCall.types
+++ b/tests/baselines/reference/esModuleInteropImportCall.types
@@ -18,8 +18,8 @@ import("./foo").then(f => {
 >                     : ^        ^^^^^^^^^^^^^^^^^^^^    ^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<{ default: () => void; }>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >then : <TResult1 = { default: () => void; }, TResult2 = never>(onfulfilled?: (value: { default: () => void; }) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >     : ^        ^^^^^^^^^^^^^^^^^^^^    ^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f => {    f.default;} : (f: { default: () => void; }) => void
diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types
index 1e7ec993e26..21c84c42c55 100644
--- a/tests/baselines/reference/escapedIdentifiers.types
+++ b/tests/baselines/reference/escapedIdentifiers.types
@@ -68,52 +68,52 @@ module moduleType\u0032 {
 }
 
 moduleType1.baz1 = 3;
->moduleType1.baz1 = 3 : number
->                     : ^^^^^^
+>moduleType1.baz1 = 3 : 3
+>                     : ^
 >moduleType1.baz1 : number
 >                 : ^^^^^^
 >moduleType1 : typeof moduleType1
 >            : ^^^^^^^^^^^^^^^^^^
 >baz1 : number
 >     : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 moduleType\u0031.baz1 = 3;
->moduleType\u0031.baz1 = 3 : number
->                          : ^^^^^^
+>moduleType\u0031.baz1 = 3 : 3
+>                          : ^
 >moduleType\u0031.baz1 : number
 >                      : ^^^^^^
 >moduleType\u0031 : typeof moduleType1
 >                 : ^^^^^^^^^^^^^^^^^^
 >baz1 : number
 >     : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 moduleType2.baz2 = 3;
->moduleType2.baz2 = 3 : number
->                     : ^^^^^^
+>moduleType2.baz2 = 3 : 3
+>                     : ^
 >moduleType2.baz2 : number
 >                 : ^^^^^^
 >moduleType2 : typeof moduleType\u0032
 >            : ^^^^^^^^^^^^^^^^^^^^^^^
 >baz2 : number
 >     : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 moduleType\u0032.baz2 = 3;
->moduleType\u0032.baz2 = 3 : number
->                          : ^^^^^^
+>moduleType\u0032.baz2 = 3 : 3
+>                          : ^
 >moduleType\u0032.baz2 : number
 >                      : ^^^^^^
 >moduleType\u0032 : typeof moduleType\u0032
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >baz2 : number
 >     : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // classes
 
@@ -143,16 +143,16 @@ var classType1Object1 = new classType1();
 >           : ^^^^^^^^^^^^^^^^^
 
 classType1Object1.foo1 = 2;
->classType1Object1.foo1 = 2 : number
->                           : ^^^^^^
+>classType1Object1.foo1 = 2 : 2
+>                           : ^
 >classType1Object1.foo1 : number
 >                       : ^^^^^^
 >classType1Object1 : classType1
 >                  : ^^^^^^^^^^
 >foo1 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var classType1Object2 = new classType\u0031();
 >classType1Object2 : classType1
@@ -163,16 +163,16 @@ var classType1Object2 = new classType\u0031();
 >                : ^^^^^^^^^^^^^^^^^
 
 classType1Object2.foo1 = 2;
->classType1Object2.foo1 = 2 : number
->                           : ^^^^^^
+>classType1Object2.foo1 = 2 : 2
+>                           : ^
 >classType1Object2.foo1 : number
 >                       : ^^^^^^
 >classType1Object2 : classType1
 >                  : ^^^^^^^^^^
 >foo1 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var classType2Object1 = new classType2();
 >classType2Object1 : classType\u0032
@@ -183,16 +183,16 @@ var classType2Object1 = new classType2();
 >           : ^^^^^^^^^^^^^^^^^^^^^^
 
 classType2Object1.foo2 = 2;
->classType2Object1.foo2 = 2 : number
->                           : ^^^^^^
+>classType2Object1.foo2 = 2 : 2
+>                           : ^
 >classType2Object1.foo2 : number
 >                       : ^^^^^^
 >classType2Object1 : classType\u0032
 >                  : ^^^^^^^^^^^^^^^
 >foo2 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var classType2Object2 = new classType\u0032();
 >classType2Object2 : classType\u0032
@@ -203,16 +203,16 @@ var classType2Object2 = new classType\u0032();
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 
 classType2Object2.foo2 = 2;
->classType2Object2.foo2 = 2 : number
->                           : ^^^^^^
+>classType2Object2.foo2 = 2 : 2
+>                           : ^
 >classType2Object2.foo2 : number
 >                       : ^^^^^^
 >classType2Object2 : classType\u0032
 >                  : ^^^^^^^^^^^^^^^
 >foo2 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 // interfaces
 interface interfaceType1 { 
@@ -235,20 +235,20 @@ var interfaceType1Object1 = <interfaceType1>{ bar1: 0 };
 >            : ^^^^^^^^^^^^^^^^^
 >bar1 : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 interfaceType1Object1.bar1 = 2;
->interfaceType1Object1.bar1 = 2 : number
->                               : ^^^^^^
+>interfaceType1Object1.bar1 = 2 : 2
+>                               : ^
 >interfaceType1Object1.bar1 : number
 >                           : ^^^^^^
 >interfaceType1Object1 : interfaceType1
 >                      : ^^^^^^^^^^^^^^
 >bar1 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var interfaceType1Object2 = <interfaceType\u0031>{ bar1: 0 };
 >interfaceType1Object2 : interfaceType1
@@ -259,20 +259,20 @@ var interfaceType1Object2 = <interfaceType\u0031>{ bar1: 0 };
 >            : ^^^^^^^^^^^^^^^^^
 >bar1 : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 interfaceType1Object2.bar1 = 2;
->interfaceType1Object2.bar1 = 2 : number
->                               : ^^^^^^
+>interfaceType1Object2.bar1 = 2 : 2
+>                               : ^
 >interfaceType1Object2.bar1 : number
 >                           : ^^^^^^
 >interfaceType1Object2 : interfaceType1
 >                      : ^^^^^^^^^^^^^^
 >bar1 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var interfaceType2Object1 = <interfaceType2>{ bar2: 0 };
 >interfaceType2Object1 : interfaceType\u0032
@@ -283,20 +283,20 @@ var interfaceType2Object1 = <interfaceType2>{ bar2: 0 };
 >            : ^^^^^^^^^^^^^^^^^
 >bar2 : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 interfaceType2Object1.bar2 = 2;
->interfaceType2Object1.bar2 = 2 : number
->                               : ^^^^^^
+>interfaceType2Object1.bar2 = 2 : 2
+>                               : ^
 >interfaceType2Object1.bar2 : number
 >                           : ^^^^^^
 >interfaceType2Object1 : interfaceType\u0032
 >                      : ^^^^^^^^^^^^^^^^^^^
 >bar2 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var interfaceType2Object2 = <interfaceType\u0032>{ bar2: 0 };
 >interfaceType2Object2 : interfaceType\u0032
@@ -307,20 +307,20 @@ var interfaceType2Object2 = <interfaceType\u0032>{ bar2: 0 };
 >            : ^^^^^^^^^^^^^^^^^
 >bar2 : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 interfaceType2Object2.bar2 = 2;
->interfaceType2Object2.bar2 = 2 : number
->                               : ^^^^^^
+>interfaceType2Object2.bar2 = 2 : 2
+>                               : ^
 >interfaceType2Object2.bar2 : number
 >                           : ^^^^^^
 >interfaceType2Object2 : interfaceType\u0032
 >                      : ^^^^^^^^^^^^^^^^^^^
 >bar2 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 
 // arguments
@@ -341,20 +341,20 @@ class testClass {
 >     : ^^^^^^
 
         arg\u0031 = 1;
->arg\u0031 = 1 : number
->              : ^^^^^^
+>arg\u0031 = 1 : 1
+>              : ^
 >arg\u0031 : number
 >          : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         arg2 = 'string';
->arg2 = 'string' : string
->                : ^^^^^^
+>arg2 = 'string' : "string"
+>                : ^^^^^^^^
 >arg2 : string
 >     : ^^^^^^
->'string' : string
->         : ^^^^^^
+>'string' : "string"
+>         : ^^^^^^^^
 
         arg\u0033 = true;
 >arg\u0033 = true : true
@@ -365,12 +365,12 @@ class testClass {
 >     : ^^^^
 
         arg4 = 2;
->arg4 = 2 : number
->         : ^^^^^^
+>arg4 = 2 : 2
+>         : ^
 >arg4 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
@@ -397,38 +397,38 @@ var constructorTestObject = new constructorTestClass(1, 'string', true, 2);
 >                                               : ^^^^^^^^^^^^^^^^^^^^
 >constructorTestClass : typeof constructorTestClass
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'string' : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>'string' : "string"
+>         : ^^^^^^^^
 >true : true
 >     : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 constructorTestObject.arg\u0031 = 1;
->constructorTestObject.arg\u0031 = 1 : number
->                                    : ^^^^^^
+>constructorTestObject.arg\u0031 = 1 : 1
+>                                    : ^
 >constructorTestObject.arg\u0031 : number
 >                                : ^^^^^^
 >constructorTestObject : constructorTestClass
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >arg\u0031 : number
 >          : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 constructorTestObject.arg2 = 'string';
->constructorTestObject.arg2 = 'string' : string
->                                      : ^^^^^^
+>constructorTestObject.arg2 = 'string' : "string"
+>                                      : ^^^^^^^^
 >constructorTestObject.arg2 : string
 >                           : ^^^^^^
 >constructorTestObject : constructorTestClass
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >arg2 : string
 >     : ^^^^^^
->'string' : string
->         : ^^^^^^
+>'string' : "string"
+>         : ^^^^^^^^
 
 constructorTestObject.arg\u0033 = true;
 >constructorTestObject.arg\u0033 = true : true
@@ -443,16 +443,16 @@ constructorTestObject.arg\u0033 = true;
 >     : ^^^^
 
 constructorTestObject.arg4 = 2;
->constructorTestObject.arg4 = 2 : number
->                               : ^^^^^^
+>constructorTestObject.arg4 = 2 : 2
+>                               : ^
 >constructorTestObject.arg4 : number
 >                           : ^^^^^^
 >constructorTestObject : constructorTestClass
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >arg4 : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 // Lables
 
diff --git a/tests/baselines/reference/evalAfter0.types b/tests/baselines/reference/evalAfter0.types
index 74fe889eb2b..3c6a1c4df8d 100644
--- a/tests/baselines/reference/evalAfter0.types
+++ b/tests/baselines/reference/evalAfter0.types
@@ -12,8 +12,8 @@
 >  : ^
 >eval : (x: string) => any
 >     : ^ ^^      ^^^^^   
->"10" : string
->     : ^^^^^^
+>"10" : "10"
+>     : ^^^^
 
 declare var eva;
 >eva : any
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index f4ce7e16828..85fd6c3f36b 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -38,8 +38,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 module M {
 >M : typeof M
@@ -72,14 +72,14 @@ module M {
 var aNumber: number = 9.9;
 >aNumber : number
 >        : ^^^^^^
->9.9 : number
->    : ^^^^^^
+>9.9 : 9.9
+>    : ^^^
 
 var aString: string = 'this is a string';
 >aString : string
 >        : ^^^^^^
->'this is a string' : string
->                   : ^^^^^^
+>'this is a string' : "this is a string"
+>                   : ^^^^^^^^^^^^^^^^^^
 
 var aDate: Date = new Date(12);
 >aDate : Date
@@ -88,8 +88,8 @@ var aDate: Date = new Date(12);
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 var anObject: Object = new Object();
 >anObject : Object
@@ -144,8 +144,8 @@ var anObjectLiteral: I = { id: 12 };
 >           : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 var anOtherObjectLiteral: { id: number } = new C();
 >anOtherObjectLiteral : { id: number; }
@@ -182,8 +182,8 @@ var aLambda: typeof F = (x) => 2;
 >         : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var aModule: typeof M = M;
 >aModule : typeof M
@@ -220,7 +220,7 @@ var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';
 >                          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->'this is a string' : string
->                   : ^^^^^^
+>'this is a string' : "this is a string"
+>                   : ^^^^^^^^^^^^^^^^^^
 
 
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types
index 0f6b91ec5e9..5bd5b847f8c 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types
@@ -38,8 +38,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 function F2(x: number): boolean { return x < 42; }
 >F2 : (x: number) => boolean
@@ -112,14 +112,14 @@ module N {
 var aNumber: number = 'this is a string';
 >aNumber : number
 >        : ^^^^^^
->'this is a string' : string
->                   : ^^^^^^
+>'this is a string' : "this is a string"
+>                   : ^^^^^^^^^^^^^^^^^^
 
 var aString: string = 9.9;
 >aString : string
 >        : ^^^^^^
->9.9 : number
->    : ^^^^^^
+>9.9 : 9.9
+>    : ^^^
 
 var aDate: Date = 9.9;
 >aDate : Date
@@ -164,8 +164,8 @@ var anObjectLiteral: I = { id: 'a string' };
 >                   : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->'a string' : string
->           : ^^^^^^
+>'a string' : "a string"
+>           : ^^^^^^^^^^
 
 var anOtherObjectLiteral: { id: string } = new C();
 >anOtherObjectLiteral : { id: string; }
@@ -202,8 +202,8 @@ var aLambda: typeof F = (x) => 'a string';
 >                  : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'a string' : string
->           : ^^^^^^
+>'a string' : "a string"
+>           : ^^^^^^^^^^
 
 var aModule: typeof M = N;
 >aModule : typeof M
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index 8eab04b8f55..acf32aa08f5 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -38,8 +38,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 module M {
 >M : typeof M
@@ -88,8 +88,8 @@ var aDate = new Date(12);
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 var anObject = new Object();
 >anObject : Object
diff --git a/tests/baselines/reference/excessPropertyCheckIntersectionWithIndexSignature.types b/tests/baselines/reference/excessPropertyCheckIntersectionWithIndexSignature.types
index 76765a416eb..4e0fa554019 100644
--- a/tests/baselines/reference/excessPropertyCheckIntersectionWithIndexSignature.types
+++ b/tests/baselines/reference/excessPropertyCheckIntersectionWithIndexSignature.types
@@ -100,12 +100,12 @@ const yy: Record<string, A> & Record<string, B> = {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/excessPropertyCheckIntersectionWithRecursiveType.types b/tests/baselines/reference/excessPropertyCheckIntersectionWithRecursiveType.types
index 05564366240..313700a47e7 100644
--- a/tests/baselines/reference/excessPropertyCheckIntersectionWithRecursiveType.types
+++ b/tests/baselines/reference/excessPropertyCheckIntersectionWithRecursiveType.types
@@ -290,8 +290,8 @@ const grandUser: GrandUser = {
   name: "Grand User",
 >name : string
 >     : ^^^^^^
->"Grand User" : string
->             : ^^^^^^
+>"Grand User" : "Grand User"
+>             : ^^^^^^^^^^^^
 
   children: [
 >children : { name: string; children: { name: string; children: { name: string; children: { name: string; }[]; }[]; }[]; }[]
@@ -305,8 +305,8 @@ const grandUser: GrandUser = {
       name: "Son",
 >name : string
 >     : ^^^^^^
->"Son" : string
->      : ^^^^^^
+>"Son" : "Son"
+>      : ^^^^^
 
       children: [
 >children : { name: string; children: { name: string; children: { name: string; }[]; }[]; }[]
@@ -320,8 +320,8 @@ const grandUser: GrandUser = {
           name: "Grand son",
 >name : string
 >     : ^^^^^^
->"Grand son" : string
->            : ^^^^^^
+>"Grand son" : "Grand son"
+>            : ^^^^^^^^^^^
 
           children: [
 >children : { name: string; children: { name: string; }[]; }[]
diff --git a/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types
index 73d98eec80a..0ee1911ffcb 100644
--- a/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types
+++ b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types
@@ -60,8 +60,8 @@ const foo: Primitive = {
     value: 10,
 >value : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     multipleOf: 5, // excess property
 >multipleOf : number
@@ -156,8 +156,8 @@ const b: DisjointDiscriminants = {
     p3: 42,
 >p3 : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     p4: "hello"
 >p4 : string
@@ -195,8 +195,8 @@ const c: DisjointDiscriminants = {
     p4: "hello"
 >p4 : string
 >   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 };
 
@@ -250,14 +250,14 @@ const c1: CommonWithOverlappingOptionals = {
     n: 1,
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a: 1,
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     b: 1  // excess property
 >b : number
@@ -286,14 +286,14 @@ const c2: CommonWithDisjointOverlappingOptionals = {
     n: 1,
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a: 1,
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     b: 1  // excess property
 >b : number
diff --git a/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types
index f7c4e83a878..81038a167f7 100644
--- a/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types
+++ b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types
@@ -55,8 +55,8 @@ const repro: BugRepro = {
       key: 'bla', // should be OK: Not excess
 >key : string
 >    : ^^^^^^
->'bla' : string
->      : ^^^^^^
+>'bla' : "bla"
+>      : ^^^^^
 
       value: null,
 >value : null
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.types b/tests/baselines/reference/excessPropertyCheckWithUnions.types
index 6cbc0fe6c77..bdfafe1a7d6 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.types
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.types
@@ -122,8 +122,8 @@ amb = { tag: "A", x: "hi" }
 >    : ^^^
 >x : string
 >  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 amb = { tag: "A", y: 12 }
 >amb = { tag: "A", y: 12 } : { tag: "A"; y: number; }
@@ -138,8 +138,8 @@ amb = { tag: "A", y: 12 }
 >    : ^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 amb = { tag: "A", x: "hi", y: 12 }
 >amb = { tag: "A", x: "hi", y: 12 } : { tag: "A"; x: string; y: number; }
@@ -154,12 +154,12 @@ amb = { tag: "A", x: "hi", y: 12 }
 >    : ^^^
 >x : string
 >  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 // correctly error on excess property 'extra', even when ambiguous
 amb = { tag: "A", x: "hi", extra: 12 }
@@ -175,8 +175,8 @@ amb = { tag: "A", x: "hi", extra: 12 }
 >    : ^^^
 >x : string
 >  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 >extra : number
 >      : ^^^^^^
 >12 : 12
@@ -195,8 +195,8 @@ amb = { tag: "A", y: 12, extra: 12 }
 >    : ^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >extra : number
 >      : ^^^^^^
 >12 : 12
@@ -277,8 +277,8 @@ over = { a: 1, b: 1, first: "ok", second: "error" }
 >  : ^
 >first : string
 >      : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 >second : string
 >       : ^^^^^^
 >"error" : "error"
@@ -301,8 +301,8 @@ over = { a: 1, b: 1, first: "ok", third: "error" }
 >  : ^
 >first : string
 >      : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 >third : string
 >      : ^^^^^^
 >"error" : "error"
@@ -401,8 +401,8 @@ const abab: AB = {
         a: "a",
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
         b: "b", // excess -- kind: "A"
 >b : string
@@ -432,14 +432,14 @@ const abac: AB = {
         a: "a",
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
         c: "c", // ok -- kind: "A", an: { a: string } | { c: string }
 >c : string
 >  : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"c" : "c"
+>    : ^^^
     }
 }
 
@@ -546,8 +546,8 @@ const obj1: { [x: string]: number } | { [x: number]: number } = { a: 'abc' };  /
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
 const obj2: { [x: string]: number } | { a: number } = { a: 5, c: 'abc' };  // Error
 >obj2 : { [x: string]: number; } | { a: number; }
@@ -560,12 +560,12 @@ const obj2: { [x: string]: number } | { a: number } = { a: 5, c: 'abc' };  // Er
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >c : string
 >  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
 // Repro from #33732
 
diff --git a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types
index ed5cc6ba826..0e6d0d9836c 100644
--- a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types
+++ b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types
@@ -36,8 +36,8 @@ let a: B = { a: { x: 'hello' } }; // ok
 >               : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 let b: B = { a: { x: 2 } }; // error - types of property x are incompatible
 >b : B
@@ -50,8 +50,8 @@ let b: B = { a: { x: 2 } }; // error - types of property x are incompatible
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 let c: B = { a: { x: 'hello', y: 2 } }; // error - y does not exist in type A
 >c : B
@@ -64,8 +64,8 @@ let c: B = { a: { x: 'hello', y: 2 } }; // error - y does not exist in type A
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >y : number
 >  : ^^^^^^
 >2 : 2
@@ -82,12 +82,12 @@ let d: D = { a: { x: 'hello' }, c: 5 }; // ok
 >               : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >c : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 let e: D = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatible
 >e : D
@@ -100,12 +100,12 @@ let e: D = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatibl
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >c : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
 >f : D
@@ -118,16 +118,16 @@ let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in typ
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >y : number
 >  : ^^^^^^
 >2 : 2
 >  : ^
 >c : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 // https://github.com/Microsoft/TypeScript/issues/18075
 
@@ -164,14 +164,14 @@ export const photo: typeof obj.photo = {
     id: 1,
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     url: '',
 >url : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     xyz: 1 // Great! This causes an error!
 >xyz : number
@@ -190,14 +190,14 @@ export const myInstance: MyType = {
     id: 1,
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     name: '',
 >name : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     photo: {
 >photo : { id: number; url: string; xyz: number; }
@@ -208,14 +208,14 @@ export const myInstance: MyType = {
         id: 1,
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         url: '',
 >url : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         xyz: 2 // This should also be an error
 >xyz : number
diff --git a/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types b/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types
index 60b5770f3b5..122ff049a34 100644
--- a/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types
+++ b/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types
@@ -20,12 +20,12 @@ let doesntWork: DoesntWork = { a: 1, c: 2, d: 3 }
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >d : number
 >  : ^^^^^^
 >3 : 3
diff --git a/tests/baselines/reference/excessPropertyErrorsSuppressed.types b/tests/baselines/reference/excessPropertyErrorsSuppressed.types
index 677132a32b8..74aed17ff38 100644
--- a/tests/baselines/reference/excessPropertyErrorsSuppressed.types
+++ b/tests/baselines/reference/excessPropertyErrorsSuppressed.types
@@ -10,8 +10,8 @@ var x: { a: string } = { a: "hello", b: 42 };  // No error
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >b : number
 >  : ^^^^^^
 >42 : 42
diff --git a/tests/baselines/reference/exhaustiveSwitchCheckCircularity.types b/tests/baselines/reference/exhaustiveSwitchCheckCircularity.types
index d3df7a3b604..d68b88fb2d1 100644
--- a/tests/baselines/reference/exhaustiveSwitchCheckCircularity.types
+++ b/tests/baselines/reference/exhaustiveSwitchCheckCircularity.types
@@ -95,12 +95,12 @@ function functionC(): void {
 >    : ^^^
 
                 key = "AA";
->key = "AA" : string
->           : ^^^^^^
+>key = "AA" : "AA"
+>           : ^^^^
 >key : string
 >    : ^^^^^^
->"AA" : string
->     : ^^^^^^
+>"AA" : "AA"
+>     : ^^^^
 
                 break;
             }
diff --git a/tests/baselines/reference/exhaustiveSwitchImplicitReturn.types b/tests/baselines/reference/exhaustiveSwitchImplicitReturn.types
index 04d7f10a914..fddb87d8359 100644
--- a/tests/baselines/reference/exhaustiveSwitchImplicitReturn.types
+++ b/tests/baselines/reference/exhaustiveSwitchImplicitReturn.types
@@ -16,8 +16,8 @@ function foo1(bar: "a"): number {
 >    : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -36,8 +36,8 @@ function foo2(bar: "a"): number {
 >    : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     let unusedVariable;
@@ -60,8 +60,8 @@ function foo3(bar: "a"): number {
 >    : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     function neverCalled() {}
@@ -84,8 +84,8 @@ function foo4(bar: "a"): number {
 >    : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     foo3(bar);
@@ -112,8 +112,8 @@ function foo5(bar: "a" | "b"): number {
 >    : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -138,8 +138,8 @@ function foo6(bar: "a", a: boolean, b: boolean): number {
             case "a": return 1;
 >"a" : "a"
 >    : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
     }
     else {
@@ -158,8 +158,8 @@ function foo6(bar: "a", a: boolean, b: boolean): number {
             case false: return 0;
 >false : false
 >      : ^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
     }
 }
diff --git a/tests/baselines/reference/exhaustiveSwitchStatements1.types b/tests/baselines/reference/exhaustiveSwitchStatements1.types
index da271250dbe..69f3f0ded86 100644
--- a/tests/baselines/reference/exhaustiveSwitchStatements1.types
+++ b/tests/baselines/reference/exhaustiveSwitchStatements1.types
@@ -22,14 +22,14 @@ function f1(x: 1 | 2): string {
             case 1: return 'a';
 >1 : 1
 >  : ^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
             case 2: return 'b';
 >2 : 2
 >  : ^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
         }
         x;  // Unreachable
 >x : never
@@ -59,22 +59,22 @@ function f2(x: 1 | 2) {
         case 1: z = 10; break;
 >1 : 1
 >  : ^
->z = 10 : number
->       : ^^^^^^
+>z = 10 : 10
+>       : ^^
 >z : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         case 2: z = 20; break;
 >2 : 2
 >  : ^
->z = 20 : number
->       : ^^^^^^
+>z = 20 : 20
+>       : ^^
 >z : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
     }
     z;  // Definitely assigned
 >z : number
@@ -109,8 +109,8 @@ function f3(x: 1 | 2) {
 >                       : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Bad input" : string
->            : ^^^^^^
+>"Bad input" : "Bad input"
+>            : ^^^^^^^^^^^
     }
 }
 
@@ -141,8 +141,8 @@ function f(e: E): number {
 >  : ^^^^^^^^
 >A : E.A
 >  : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case E.B: return 1
 >E.B : E.B
@@ -151,8 +151,8 @@ function f(e: E): number {
 >  : ^^^^^^^^
 >B : E.B
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -186,8 +186,8 @@ function g(e: E): number {
 >  : ^^^^^^^^
 >A : E.A
 >  : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
             case E.B: return 1
 >E.B : E.B
@@ -196,8 +196,8 @@ function g(e: E): number {
 >  : ^^^^^^^^
 >B : E.B
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
 }
 
@@ -346,8 +346,8 @@ function area(s: Shape): number {
 >     : ^^^^
 >sqrt : (x: number) => number
 >     : ^ ^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >4 : 4
 >  : ^
 >s.side : number
@@ -477,8 +477,8 @@ function areaWrapped(s: Shape): number {
 >     : ^^^^
 >sqrt : (x: number) => number
 >     : ^ ^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >4 : 4
 >  : ^
 >s.side : number
@@ -536,12 +536,12 @@ function thisGivesError(e: MyEnum): string {
 >       : ^^^^^^^^^^^^^
 >A : MyEnum.A
 >  : ^^^^^^^^
->s = "it was A" : string
->               : ^^^^^^
+>s = "it was A" : "it was A"
+>               : ^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"it was A" : string
->           : ^^^^^^
+>"it was A" : "it was A"
+>           : ^^^^^^^^^^
 
 		case MyEnum.B: s = "it was B"; break;
 >MyEnum.B : MyEnum.B
@@ -550,12 +550,12 @@ function thisGivesError(e: MyEnum): string {
 >       : ^^^^^^^^^^^^^
 >B : MyEnum.B
 >  : ^^^^^^^^
->s = "it was B" : string
->               : ^^^^^^
+>s = "it was B" : "it was B"
+>               : ^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"it was B" : string
->           : ^^^^^^
+>"it was B" : "it was B"
+>           : ^^^^^^^^^^
 	}
 	return s;
 >s : string
@@ -583,12 +583,12 @@ function good1(e: MyEnum): string {
 >       : ^^^^^^^^^^^^^
 >A : MyEnum.A
 >  : ^^^^^^^^
->s = "it was A" : string
->               : ^^^^^^
+>s = "it was A" : "it was A"
+>               : ^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"it was A" : string
->           : ^^^^^^
+>"it was A" : "it was A"
+>           : ^^^^^^^^^^
 
 		case MyEnum.B: s = "it was B"; break;
 >MyEnum.B : MyEnum.B
@@ -597,20 +597,20 @@ function good1(e: MyEnum): string {
 >       : ^^^^^^^^^^^^^
 >B : MyEnum.B
 >  : ^^^^^^^^
->s = "it was B" : string
->               : ^^^^^^
+>s = "it was B" : "it was B"
+>               : ^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"it was B" : string
->           : ^^^^^^
+>"it was B" : "it was B"
+>           : ^^^^^^^^^^
 
 		default: s = "it was something else"; break;
->s = "it was something else" : string
->                            : ^^^^^^
+>s = "it was something else" : "it was something else"
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"it was something else" : string
->                        : ^^^^^^
+>"it was something else" : "it was something else"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 	}
 	return s;
 >s : string
@@ -634,8 +634,8 @@ function good2(e: MyEnum): string {
 >       : ^^^^^^^^^^^^^
 >A : MyEnum.A
 >  : ^^^^^^^^
->"it was A" : string
->           : ^^^^^^
+>"it was A" : "it was A"
+>           : ^^^^^^^^^^
 
 		case MyEnum.B: return "it was B";
 >MyEnum.B : MyEnum.B
@@ -644,8 +644,8 @@ function good2(e: MyEnum): string {
 >       : ^^^^^^^^^^^^^
 >B : MyEnum.B
 >  : ^^^^^^^^
->"it was B" : string
->           : ^^^^^^
+>"it was B" : "it was B"
+>           : ^^^^^^^^^^
 	}
 }
 
@@ -776,8 +776,8 @@ function withDefault(s1: Shape2, s2: Shape2): string {
 >         : ^^^^^^^^
 
             return "1";
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
         case "circle":
 >"circle" : "circle"
@@ -796,21 +796,21 @@ function withDefault(s1: Shape2, s2: Shape2): string {
 >         : ^^^^^^^^
 
                     return "2";
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
                 case "circle":
 >"circle" : "circle"
 >         : ^^^^^^^^
 
                     return "3";
->"3" : string
->    : ^^^^^^
+>"3" : "3"
+>    : ^^^
 
                 default:
                     return "never";
->"never" : string
->        : ^^^^^^
+>"never" : "never"
+>        : ^^^^^^^
             }
     }
 }
@@ -836,8 +836,8 @@ function withoutDefault(s1: Shape2, s2: Shape2): string {
 >         : ^^^^^^^^
 
             return "1";
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
         case "circle":
 >"circle" : "circle"
@@ -856,16 +856,16 @@ function withoutDefault(s1: Shape2, s2: Shape2): string {
 >         : ^^^^^^^^
 
                     return "2";
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
                 case "circle":
 >"circle" : "circle"
 >         : ^^^^^^^^
 
                     return "3";
->"3" : string
->    : ^^^^^^
+>"3" : "3"
+>    : ^^^
             }
     }
 }
@@ -889,22 +889,22 @@ function test4(value: 1 | 2) {
         case 1: x = "one"; break;
 >1 : 1
 >  : ^
->x = "one" : string
->          : ^^^^^^
+>x = "one" : "one"
+>          : ^^^^^
 >x : string
 >  : ^^^^^^
->"one" : string
->      : ^^^^^^
+>"one" : "one"
+>      : ^^^^^
 
         case 2: x = "two"; break;
 >2 : 2
 >  : ^
->x = "two" : string
->          : ^^^^^^
+>x = "two" : "two"
+>          : ^^^^^
 >x : string
 >  : ^^^^^^
->"two" : string
->      : ^^^^^^
+>"two" : "two"
+>      : ^^^^^
     }
     return x;
 >x : string
@@ -986,8 +986,8 @@ function foo() {
     const foo: number | undefined = 0;
 >foo : number | undefined
 >    : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     while (true) {
 >true : true
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
index bf7ae899ed3..ca4641edc8c 100644
--- a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
@@ -42,13 +42,13 @@ function f(value: A | B): number {
         case "A": return 0;
 >"A" : "A"
 >    : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case "B": return 1;
 >"B" : "B"
 >    : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.js b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.js
index c235a5df719..d47932e6513 100644
--- a/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.js
+++ b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.js
@@ -29,9 +29,9 @@ exports.expr2[s] = 0;
 //// [expandoFunctionExpressionsWithDynamicNames.d.ts]
 export declare const expr: {
     (): void;
-    X: any;
+    X: number;
 };
 export declare const expr2: {
     (): void;
-    X: any;
+    X: number;
 };
diff --git a/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.types b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.types
index 551d531fd3b..83a7899ca40 100644
--- a/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.types
+++ b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames.types
@@ -10,36 +10,36 @@ const s = "X";
 >    : ^^^
 
 export const expr = () => {}
->expr : { (): void; X: any; }
->     : ^^^^^^^^^^^^^^^^^^^^^
->() => {} : { (): void; X: any; }
->         : ^^^^^^^^^^^^^^^^^^^^^
+>expr : { (): void; X: number; }
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^
+>() => {} : { (): void; X: number; }
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 expr[s] = 0
 >expr[s] = 0 : 0
 >            : ^
->expr[s] : any
->        : ^^^
->expr : { (): void; X: any; }
->     : ^^^^^^^^^^^^^^^^^^^^^
+>expr[s] : number
+>        : ^^^^^^
+>expr : { (): void; X: number; }
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^
 >s : "X"
 >  : ^^^
 >0 : 0
 >  : ^
 
 export const expr2 = function () {}
->expr2 : { (): void; X: any; }
->      : ^^^^^^^^^^^^^^^^^^^^^
->function () {} : { (): void; X: any; }
->               : ^^^^^^^^^^^^^^^^^^^^^
+>expr2 : { (): void; X: number; }
+>      : ^^^^^^^^^^^^^^^^^^^^^^^^
+>function () {} : { (): void; X: number; }
+>               : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 expr2[s] = 0
 >expr2[s] = 0 : 0
 >             : ^
->expr2[s] : any
->         : ^^^
->expr2 : { (): void; X: any; }
->      : ^^^^^^^^^^^^^^^^^^^^^
+>expr2[s] : number
+>         : ^^^^^^
+>expr2 : { (): void; X: number; }
+>      : ^^^^^^^^^^^^^^^^^^^^^^^^
 >s : "X"
 >  : ^^^
 >0 : 0
diff --git a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types
index 8a2f3a5b090..892ddc51778 100644
--- a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types
+++ b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types
@@ -123,198 +123,198 @@ declare namespace Foo {
 >          : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >foo : number
 >    : ^^^^^^
 >(Foo.baz = 1) + (Foo.bar  = 0) : number
 >                               : ^^^^^^
->(Foo.baz = 1) : number
->              : ^^^^^^
->Foo.baz = 1 : number
->            : ^^^^^^
+>(Foo.baz = 1) : 1
+>              : ^
+>Foo.baz = 1 : 1
+>            : ^
 >Foo.baz : number
 >        : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >baz : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
->(Foo.bar  = 0) : number
->               : ^^^^^^
->Foo.bar  = 0 : number
->             : ^^^^^^
+>1 : 1
+>  : ^
+>(Foo.bar  = 0) : 0
+>               : ^
+>Foo.bar  = 0 : 0
+>             : ^
 >Foo.bar : number
 >        : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >bar : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 if(Foo.fromIf = 1) {
->Foo.fromIf = 1 : number
->               : ^^^^^^
+>Foo.fromIf = 1 : 1
+>               : ^
 >Foo.fromIf : number
 >           : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromIf : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     Foo.inIf = 1;
->Foo.inIf = 1 : number
->             : ^^^^^^
+>Foo.inIf = 1 : 1
+>             : ^
 >Foo.inIf : number
 >         : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >inIf : number
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 while(Foo.fromWhileCondition = 1) {
->Foo.fromWhileCondition = 1 : number
->                           : ^^^^^^
+>Foo.fromWhileCondition = 1 : 1
+>                           : ^
 >Foo.fromWhileCondition : number
 >                       : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromWhileCondition : number
 >                   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     Foo.fromWhileBody = 1;
->Foo.fromWhileBody = 1 : number
->                      : ^^^^^^
+>Foo.fromWhileBody = 1 : 1
+>                      : ^
 >Foo.fromWhileBody : number
 >                  : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromWhileBody : number
 >              : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     {
         Foo.fromWhileBodyNested = 1;
->Foo.fromWhileBodyNested = 1 : number
->                            : ^^^^^^
+>Foo.fromWhileBodyNested = 1 : 1
+>                            : ^
 >Foo.fromWhileBodyNested : number
 >                        : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromWhileBodyNested : number
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
 do {
     Foo.fromDoBody = 1;
->Foo.fromDoBody = 1 : number
->                   : ^^^^^^
+>Foo.fromDoBody = 1 : 1
+>                   : ^
 >Foo.fromDoBody : number
 >               : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromDoBody : number
 >           : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     {
         Foo.fromDoBodyNested = 1;
->Foo.fromDoBodyNested = 1 : number
->                         : ^^^^^^
+>Foo.fromDoBodyNested = 1 : 1
+>                         : ^
 >Foo.fromDoBodyNested : number
 >                     : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromDoBodyNested : number
 >                 : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 } while(Foo.fromDoCondition = 1);
->Foo.fromDoCondition = 1 : number
->                        : ^^^^^^
+>Foo.fromDoCondition = 1 : 1
+>                        : ^
 >Foo.fromDoCondition : number
 >                    : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromDoCondition : number
 >                : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 for(Foo.forInit = 1; (Foo.forCond = 1) > 1; Foo.forIncr = 1){
->Foo.forInit = 1 : number
->                : ^^^^^^
+>Foo.forInit = 1 : 1
+>                : ^
 >Foo.forInit : number
 >            : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >forInit : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(Foo.forCond = 1) > 1 : boolean
 >                      : ^^^^^^^
->(Foo.forCond = 1) : number
->                  : ^^^^^^
->Foo.forCond = 1 : number
->                : ^^^^^^
+>(Foo.forCond = 1) : 1
+>                  : ^
+>Foo.forCond = 1 : 1
+>                : ^
 >Foo.forCond : number
 >            : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >forCond : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
 >1 : 1
 >  : ^
->Foo.forIncr = 1 : number
->                : ^^^^^^
+>1 : 1
+>  : ^
+>Foo.forIncr = 1 : 1
+>                : ^
 >Foo.forIncr : number
 >            : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >forIncr : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     Foo.fromForBody = 1;
->Foo.fromForBody = 1 : number
->                    : ^^^^^^
+>Foo.fromForBody = 1 : 1
+>                    : ^
 >Foo.fromForBody : number
 >                : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromForBody : number
 >            : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     {
         Foo.fromForBodyNested = 1;
->Foo.fromForBodyNested = 1 : number
->                          : ^^^^^^
+>Foo.fromForBodyNested = 1 : 1
+>                          : ^
 >Foo.fromForBodyNested : number
 >                      : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromForBodyNested : number
 >                  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -334,28 +334,28 @@ for(let f of (Foo.forOf = []) ){
 >   : ^^^^^^^^^^^
 
     Foo.fromForOfBody = 1;
->Foo.fromForOfBody = 1 : number
->                      : ^^^^^^
+>Foo.fromForOfBody = 1 : 1
+>                      : ^
 >Foo.fromForOfBody : number
 >                  : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromForOfBody : number
 >              : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     {
         Foo.fromForOfBodyNested = 1;
->Foo.fromForOfBodyNested = 1 : number
->                            : ^^^^^^
+>Foo.fromForOfBodyNested = 1 : 1
+>                            : ^
 >Foo.fromForOfBodyNested : number
 >                        : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromForOfBodyNested : number
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -377,27 +377,27 @@ for(let f in (Foo.forIn = []) ){
 >   : ^^^^^^^^^^^
 
     Foo.fromForInBody = 1;
->Foo.fromForInBody = 1 : number
->                      : ^^^^^^
+>Foo.fromForInBody = 1 : 1
+>                      : ^
 >Foo.fromForInBody : number
 >                  : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromForInBody : number
 >              : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     {
         Foo.fromForInBodyNested = 1;
->Foo.fromForInBodyNested = 1 : number
->                            : ^^^^^^
+>Foo.fromForInBodyNested = 1 : 1
+>                            : ^
 >Foo.fromForInBodyNested : number
 >                        : ^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
 >fromForInBodyNested : number
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/expandoOnAlias.types b/tests/baselines/reference/expandoOnAlias.types
index 2e2eba4b81b..2cd03aed57c 100644
--- a/tests/baselines/reference/expandoOnAlias.types
+++ b/tests/baselines/reference/expandoOnAlias.types
@@ -43,16 +43,16 @@ new Vue();
 
 // This is not an expando declaration; it's just a plain property assignment.
 config.x = 1;
->config.x = 1 : number
->             : ^^^^^^
+>config.x = 1 : 1
+>             : ^
 >config.x : number
 >         : ^^^^^^
 >config : { x: number; }
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // This is not an expando declaration; it works because non-strict JS allows
 // loosey goosey assignment on objects.
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.types b/tests/baselines/reference/exportAssignmentConstrainedGenericType.types
index 8cf14dfefff..2d8e420b2ea 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.types
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.types
@@ -26,12 +26,12 @@ var y = new foo({a: "test", b: 42}); // Should be OK
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 >b : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var z: number = y.test.b;
 >z : number
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.types b/tests/baselines/reference/exportAssignmentMergedInterface.types
index 3b69f81fee0..51a991fade0 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.types
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.types
@@ -14,7 +14,7 @@ x("test");
 >          : ^^^^
 >x : foo
 >  : ^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 x(42);
@@ -22,8 +22,8 @@ x(42);
 >      : ^^^^^^
 >x : foo
 >  : ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var y: string = x.b;
 >y : string
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.types b/tests/baselines/reference/exportAssignmentMergedModule.types
index 80cae31f1ee..49bdd866b00 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.types
+++ b/tests/baselines/reference/exportAssignmentMergedModule.types
@@ -50,8 +50,8 @@ if(!!foo.b){
 >    : ^^^^^^^^^^
 >c : (a: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 === foo_0.ts ===
 module Foo {
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.types b/tests/baselines/reference/exportClassExtendingIntersection.types
index c5a621679ae..bfda7a0dca2 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.types
+++ b/tests/baselines/reference/exportClassExtendingIntersection.types
@@ -88,8 +88,8 @@ const myExtendedClass = new MyExtendedClass('string');
 >                              : ^^^^^^^^^^^^^^^
 >MyExtendedClass : typeof MyExtendedClass
 >                : ^^^^^^^^^^^^^^^^^^^^^^
->'string' : string
->         : ^^^^^^
+>'string' : "string"
+>         : ^^^^^^^^
 
 const AnotherMixedClass = MyMixin(MyExtendedClass);
 >AnotherMixedClass : typeof MyExtendedClass & import("BaseClass").Constructor<MyMixin>
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.types b/tests/baselines/reference/exportDefaultAsyncFunction2.types
index be832fda095..e99b663eddc 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.types
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.types
@@ -39,8 +39,8 @@ export default async(() => await(Promise.resolve(1)));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 === b.ts ===
 export default async () => { return 0; };
diff --git a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types
index ae3c3771339..736899f25cb 100644
--- a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types
+++ b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types
@@ -5,6 +5,6 @@ export default class {
     static z: string = "Foo";
 >z : string
 >  : ^^^^^^
->"Foo" : string
->      : ^^^^^^
+>"Foo" : "Foo"
+>      : ^^^^^
 }
diff --git a/tests/baselines/reference/exportDefaultInterfaceAndFunctionOverloads.types b/tests/baselines/reference/exportDefaultInterfaceAndFunctionOverloads.types
index 01c2e98403e..3fb06056df6 100644
--- a/tests/baselines/reference/exportDefaultInterfaceAndFunctionOverloads.types
+++ b/tests/baselines/reference/exportDefaultInterfaceAndFunctionOverloads.types
@@ -20,8 +20,8 @@ export default function foo(value: string | number): string | number {
 >      : ^^^^^^^^^^^^^^^
 
     return 1
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 export default interface Foo {}
 
diff --git a/tests/baselines/reference/exportDefaultInterfaceClassAndFunctionOverloads.types b/tests/baselines/reference/exportDefaultInterfaceClassAndFunctionOverloads.types
index 3a3e98df200..70b68ff0f75 100644
--- a/tests/baselines/reference/exportDefaultInterfaceClassAndFunctionOverloads.types
+++ b/tests/baselines/reference/exportDefaultInterfaceClassAndFunctionOverloads.types
@@ -20,8 +20,8 @@ export default function foo(value: string | number): string | number {
 >      : ^^^^^^^^^^^^^^^
 
     return 1
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 declare class Foo {}
 >Foo : Foo
diff --git a/tests/baselines/reference/exportDefaultProperty.types b/tests/baselines/reference/exportDefaultProperty.types
index d68b1d1e282..eb90e946a89 100644
--- a/tests/baselines/reference/exportDefaultProperty.types
+++ b/tests/baselines/reference/exportDefaultProperty.types
@@ -122,8 +122,8 @@ namespace A {
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 export default A.B;
 >A.B : typeof A.B
diff --git a/tests/baselines/reference/exportDefaultTypeAndFunctionOverloads.types b/tests/baselines/reference/exportDefaultTypeAndFunctionOverloads.types
index 0be19caa4a9..deadb919dae 100644
--- a/tests/baselines/reference/exportDefaultTypeAndFunctionOverloads.types
+++ b/tests/baselines/reference/exportDefaultTypeAndFunctionOverloads.types
@@ -20,8 +20,8 @@ export default function foo(value: string | number): string | number {
 >      : ^^^^^^^^^^^^^^^
 
     return 1
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 type Foo = {}
 >Foo : Foo
diff --git a/tests/baselines/reference/exportEqualsClassNoRedeclarationError.types b/tests/baselines/reference/exportEqualsClassNoRedeclarationError.types
index f32fb3069b8..7646f3646f0 100644
--- a/tests/baselines/reference/exportEqualsClassNoRedeclarationError.types
+++ b/tests/baselines/reference/exportEqualsClassNoRedeclarationError.types
@@ -10,8 +10,8 @@ class SomeClass {
 >         : ^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     static set someProp(value: number) {}
diff --git a/tests/baselines/reference/exportEqualsClassRedeclarationError.types b/tests/baselines/reference/exportEqualsClassRedeclarationError.types
index 9d37619cbff..1e91dec6a15 100644
--- a/tests/baselines/reference/exportEqualsClassRedeclarationError.types
+++ b/tests/baselines/reference/exportEqualsClassRedeclarationError.types
@@ -10,8 +10,8 @@ class SomeClass {
 >         : ^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     static set someProp(value: number) {}
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.types b/tests/baselines/reference/exportEqualsDefaultProperty.types
index aeb2a6cb3e7..7a7481cbe8e 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.types
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.types
@@ -39,6 +39,6 @@ foo.toExponential(2);
 >    : ^^^^^^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/exportEqualsProperty.types b/tests/baselines/reference/exportEqualsProperty.types
index 76dc735674a..a3523f6e589 100644
--- a/tests/baselines/reference/exportEqualsProperty.types
+++ b/tests/baselines/reference/exportEqualsProperty.types
@@ -114,8 +114,8 @@ namespace A {
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 export = A.B;
 >A.B : typeof A.B
diff --git a/tests/baselines/reference/exportImportAlias.types b/tests/baselines/reference/exportImportAlias.types
index 1a1e0ffd9d5..121ede99f53 100644
--- a/tests/baselines/reference/exportImportAlias.types
+++ b/tests/baselines/reference/exportImportAlias.types
@@ -76,10 +76,10 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0);
 >  : ^^^^^^^^
 >Point : typeof A.Point
 >      : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 var c: { name: string };
 >c : { name: string; }
@@ -172,10 +172,10 @@ var n: { x: number; y: number; } = new Z.y.Point(0, 0);
 >  : ^^^^^^^^^^
 >Point : typeof X.Y.Point
 >      : ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 module K {
 >K : typeof K
@@ -242,8 +242,8 @@ var o = new M.D('Hello');
 >  : ^^^^^^^^
 >D : typeof K.L
 >  : ^^^^^^^^^^
->'Hello' : string
->        : ^^^^^^
+>'Hello' : "Hello"
+>        : ^^^^^^^
 
 var p: { x: number; y: number; }
 >p : { x: number; y: number; }
diff --git a/tests/baselines/reference/exportImportAndClodule.types b/tests/baselines/reference/exportImportAndClodule.types
index 75bdafcd153..d44492dc05e 100644
--- a/tests/baselines/reference/exportImportAndClodule.types
+++ b/tests/baselines/reference/exportImportAndClodule.types
@@ -63,8 +63,8 @@ var o = new M.D('Hello');
 >  : ^^^^^^^^
 >D : typeof K.L
 >  : ^^^^^^^^^^
->'Hello' : string
->        : ^^^^^^
+>'Hello' : "Hello"
+>        : ^^^^^^^
 
 var p: { x: number; y: number; }
 >p : { x: number; y: number; }
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.types b/tests/baselines/reference/exportImportNonInstantiatedModule.types
index 1676bd7b9b0..e85469e47b9 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule.types
@@ -29,6 +29,6 @@ var x: B.A1.I = { x: 1 };
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index 8f547a74b05..f554cdbe385 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -16,8 +16,8 @@ export function w(): e.w { // Should be OK
 >                 : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->'value' : string
->        : ^^^^^^
+>'value' : "value"
+>        : ^^^^^^^
 }
 === w1.ts ===
 export = Widget1
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.types b/tests/baselines/reference/exportNonInitializedVariablesAMD.types
index 37e3262e38d..9f6a7dff969 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.types
@@ -102,14 +102,14 @@ export let b1 = 1;
 export var c1: string = 'a';
 >c1 : string
 >   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 export let d1: number = 1;
 >d1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class D {}
 >D : D
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types
index fa4db528c45..e29f16772e1 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types
@@ -102,14 +102,14 @@ export let b1 = 1;
 export var c1: string = 'a';
 >c1 : string
 >   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 export let d1: number = 1;
 >d1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class D {}
 >D : D
diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.types b/tests/baselines/reference/exportNonInitializedVariablesES6.types
index c429cdcfcc9..a05d6cfac59 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesES6.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesES6.types
@@ -102,14 +102,14 @@ export let b1 = 1;
 export var c1: string = 'a';
 >c1 : string
 >   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 export let d1: number = 1;
 >d1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class D {}
 >D : D
diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.types b/tests/baselines/reference/exportNonInitializedVariablesSystem.types
index beb0bf97bc0..2a127da4bfe 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesSystem.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.types
@@ -102,14 +102,14 @@ export let b1 = 1;
 export var c1: string = 'a';
 >c1 : string
 >   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 export let d1: number = 1;
 >d1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class D {}
 >D : D
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.types b/tests/baselines/reference/exportNonInitializedVariablesUMD.types
index 606ea0acaed..13e6a1204fa 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.types
@@ -102,14 +102,14 @@ export let b1 = 1;
 export var c1: string = 'a';
 >c1 : string
 >   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 export let d1: number = 1;
 >d1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class D {}
 >D : D
diff --git a/tests/baselines/reference/exportNonVisibleType.types b/tests/baselines/reference/exportNonVisibleType.types
index c340e31bc97..5c6c152b3ff 100644
--- a/tests/baselines/reference/exportNonVisibleType.types
+++ b/tests/baselines/reference/exportNonVisibleType.types
@@ -18,12 +18,12 @@ var x: I1 = {a: "test", b: 42};
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 >b : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 export = x; // Should fail, I1 not exported.
 >x : I1
diff --git a/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.types b/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.types
index d4285a75edc..3b360d3b041 100644
--- a/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.types
+++ b/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.types
@@ -16,8 +16,8 @@ export const myValue: Something<string> = Something.of("abc")
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >of : <A>(value: A) => import("Something").Something<A>
 >   : ^ ^^     ^^ ^^^^^       ^^^^^^^^^^^^^^^^^  ^^^^^^^^^   
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 export type MyType = Something.SubType<string>
 >MyType : MyType
diff --git a/tests/baselines/reference/expressionTypeNodeShouldError.types b/tests/baselines/reference/expressionTypeNodeShouldError.types
index b744e15bc30..b4a503438da 100644
--- a/tests/baselines/reference/expressionTypeNodeShouldError.types
+++ b/tests/baselines/reference/expressionTypeNodeShouldError.types
@@ -73,8 +73,8 @@ type ItemType = "".typeof(nodes.item(0));
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >item : (index: number) => HTMLLIElement
 >     : ^     ^^      ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 === number.ts ===
 interface Number {
@@ -138,8 +138,8 @@ type ItemType2 = 4..typeof(nodes.item(0));
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >item : (index: number) => HTMLLIElement
 >     : ^     ^^      ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 === boolean.ts ===
 interface Boolean {
@@ -207,7 +207,7 @@ type ItemType3 = true.typeof(nodes.item(0));
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >item : (index: number) => HTMLLIElement
 >     : ^     ^^      ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
diff --git a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types
index 7ff46828d82..e69740ec37a 100644
--- a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types
+++ b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types
@@ -10,8 +10,8 @@ export async function foo({ foo = await import("./bar") }) {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./bar") : Promise<typeof import("bar")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./bar" : string
->        : ^^^^^^
+>"./bar" : "./bar"
+>        : ^^^^^^^
 }
 
 export function* foo2({ foo = yield "a" }) {
diff --git a/tests/baselines/reference/extendConstructSignatureInInterface.types b/tests/baselines/reference/extendConstructSignatureInInterface.types
index da9c4c0bd03..e27cbde0fdd 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.types
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.types
@@ -25,6 +25,6 @@ var e: E = new E(1);
 >         : ^
 >E : typeof E
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/extendedInterfaceGenericType.types b/tests/baselines/reference/extendedInterfaceGenericType.types
index 9a866da72f3..d7070fc8958 100644
--- a/tests/baselines/reference/extendedInterfaceGenericType.types
+++ b/tests/baselines/reference/extendedInterfaceGenericType.types
@@ -40,6 +40,6 @@ betaOfNumber.takesArgOfT(5);
 >             : ^^^^^^^^^^^^
 >takesArgOfT : (arg: number) => Alpha<number>
 >            : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/externFunc.types b/tests/baselines/reference/externFunc.types
index 17319d09aca..b275b7c5daf 100644
--- a/tests/baselines/reference/externFunc.types
+++ b/tests/baselines/reference/externFunc.types
@@ -12,6 +12,6 @@ parseInt("2");
 >              : ^^^^^^
 >parseInt : { (string: string, radix?: number): number; (s: string): number; }
 >         : ^^^      ^^      ^^     ^^^      ^^^      ^^^ ^^      ^^^      ^^^
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
diff --git a/tests/baselines/reference/externSemantics.types b/tests/baselines/reference/externSemantics.types
index 05b754008fb..d862a35ccab 100644
--- a/tests/baselines/reference/externSemantics.types
+++ b/tests/baselines/reference/externSemantics.types
@@ -14,6 +14,6 @@ declare var v;
 declare var y:number=3;
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/fallFromLastCase1.types b/tests/baselines/reference/fallFromLastCase1.types
index f96cc8b9455..f19ed69dd83 100644
--- a/tests/baselines/reference/fallFromLastCase1.types
+++ b/tests/baselines/reference/fallFromLastCase1.types
@@ -25,8 +25,8 @@ function foo1(a: number) {
 >use("1") : any
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
             break;
         case 2:
@@ -37,8 +37,8 @@ function foo1(a: number) {
 >use("2") : any
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
     }
 }
 
@@ -61,8 +61,8 @@ function foo2(a: number) {
 >use("1") : any
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
             break;
         default:
@@ -70,7 +70,7 @@ function foo2(a: number) {
 >use("2") : any
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
     }
 }
diff --git a/tests/baselines/reference/fallFromLastCase2.types b/tests/baselines/reference/fallFromLastCase2.types
index c7372565370..8ad4ce3c549 100644
--- a/tests/baselines/reference/fallFromLastCase2.types
+++ b/tests/baselines/reference/fallFromLastCase2.types
@@ -26,8 +26,8 @@ function foo1(a: number) {
 >         : ^^^
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
             break;
         case 2:
@@ -39,8 +39,8 @@ function foo1(a: number) {
 >         : ^^^
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
         case 3:
 >3 : 3
@@ -51,8 +51,8 @@ function foo1(a: number) {
 >         : ^^^
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"3" : string
->    : ^^^^^^
+>"3" : "3"
+>    : ^^^
     }
 }
 
@@ -76,8 +76,8 @@ function foo2(a: number) {
 >         : ^^^
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
             break;
         default:
@@ -86,8 +86,8 @@ function foo2(a: number) {
 >         : ^^^
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"2" : string
->    : ^^^^^^
+>"2" : "2"
+>    : ^^^
 
         case 2:
 >2 : 2
@@ -98,7 +98,7 @@ function foo2(a: number) {
 >         : ^^^
 >use : (a: string) => any
 >    : ^ ^^      ^^^^^^^^
->"3" : string
->    : ^^^^^^
+>"3" : "3"
+>    : ^^^
     }
 }
diff --git a/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types b/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types
index e47868ef42d..0cfa1f1a314 100644
--- a/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types
+++ b/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types
@@ -31,8 +31,8 @@ trans(([b,c]) => 'foo');
 >  : ^^^
 >c : any
 >  : ^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 trans(({d: [e,f]}) => 'foo');
 >trans(({d: [e,f]}) => 'foo') : number
@@ -47,8 +47,8 @@ trans(({d: [e,f]}) => 'foo');
 >  : ^^^
 >f : any
 >  : ^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 trans(([{g},{h}]) => 'foo');
 >trans(([{g},{h}]) => 'foo') : number
@@ -61,8 +61,8 @@ trans(([{g},{h}]) => 'foo');
 >  : ^^^
 >h : any
 >  : ^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 trans(({a, b = 10}) => a);
 >trans(({a, b = 10}) => a) : number
diff --git a/tests/baselines/reference/fatArrowSelf.types b/tests/baselines/reference/fatArrowSelf.types
index e5adaf9f21a..3df444eebca 100644
--- a/tests/baselines/reference/fatArrowSelf.types
+++ b/tests/baselines/reference/fatArrowSelf.types
@@ -55,8 +55,8 @@ module Consumer {
 >        : ^^^^^^^^^^^^^^^^^^^
 >addListener : (type: string, listener: Events.ListenerCallback) => void
 >            : ^    ^^      ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'change' : string
->         : ^^^^^^
+>'change' : "change"
+>         : ^^^^^^^^
 >(e) => {                this.changed();            } : (e: any) => void
 >                                                     : ^ ^^^^^^^^^^^^^^
 >e : any
diff --git a/tests/baselines/reference/fatarrowfunctions.types b/tests/baselines/reference/fatarrowfunctions.types
index 8dcbf414444..191476f94d0 100644
--- a/tests/baselines/reference/fatarrowfunctions.types
+++ b/tests/baselines/reference/fatarrowfunctions.types
@@ -332,8 +332,8 @@ var messenger = {
 >        : ^^^
 >toString : any
 >         : ^^^
->3000 : number
->     : ^^^^^^
+>3000 : 3000
+>     : ^^^^
     }
 };
 
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctions.types b/tests/baselines/reference/fatarrowfunctionsInFunctions.types
index d0e80339c48..2c625b58426 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctions.types
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctions.types
@@ -52,8 +52,8 @@ var messenger = {
 >         : ^^^
 
         }, 3000); 
->3000 : number
->     : ^^^^^^
+>3000 : 3000
+>     : ^^^^
     }
 }; 
 messenger.start(); 
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types
index 1263986b344..789ae0f3933 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types
@@ -63,8 +63,8 @@ arg => 2;
 >                       : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >6 : 6
 >  : ^
 
@@ -136,12 +136,12 @@ arg => 2;
 >                                           : ^    ^^^      ^^    ^^^      ^^^^^^^^^^^
 >arg1 : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >arg2 : number
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >16 : 16
 >   : ^^
 
@@ -233,8 +233,8 @@ arg => 2;
 >                        : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >26 : 26
 >   : ^^
 
@@ -357,8 +357,8 @@ false ? (arg?: number = 0) => 47 : null;
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >47 : 47
 >   : ^^
 
@@ -470,8 +470,8 @@ false ? ((arg?: number = 0) => 57) : null;
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >57 : 57
 >   : ^^
 
@@ -571,8 +571,8 @@ false ? null : (arg?: number = 0) => 67;
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >67 : 67
 >   : ^^
 
@@ -712,8 +712,8 @@ false ? null : (...arg: number[]) => 68;
 >                        : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >94 : 94
 >   : ^^
 >Function : FunctionConstructor
@@ -872,8 +872,8 @@ false ? null : (...arg: number[]) => 68;
 >                      : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 >'' : ""
@@ -884,8 +884,8 @@ false ? null : (...arg: number[]) => 68;
 >                        : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >105 : 105
 >    : ^^^
 
@@ -900,8 +900,8 @@ false ? null : (...arg: number[]) => 68;
 >                       : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 >'' : ""
@@ -912,8 +912,8 @@ false ? null : (...arg: number[]) => 68;
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >106 : 106
 >    : ^^^
 
@@ -1071,8 +1071,8 @@ foo(
 >                       : ^ ^^^      ^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >116 : 116
 >    : ^^^
 
@@ -1091,8 +1091,8 @@ foo(
 >                        : ^ ^^^      ^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >118 : 118
 >    : ^^^
 
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.types b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.types
index 33229075c17..f8ba28ffa78 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.types
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.types
@@ -10,8 +10,8 @@
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >47 : 47
 >   : ^^
 
@@ -26,8 +26,8 @@
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >57 : 57
 >   : ^^
 
@@ -40,8 +40,8 @@
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >67 : 67
 >   : ^^
 
@@ -56,8 +56,8 @@
 >                       : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >0 : 0
 >  : ^
 >'' : ""
@@ -68,8 +68,8 @@
 >                         : ^   ^^^      ^^^^^^^^^^^
 >arg : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >106 : 106
 >    : ^^^
 
@@ -139,8 +139,8 @@
 >                       : ^ ^^^      ^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >116 : 116
 >    : ^^^
 
@@ -159,8 +159,8 @@
 >                        : ^ ^^^      ^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >118 : 118
 >    : ^^^
 
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.types b/tests/baselines/reference/fieldAndGetterWithSameName.types
index 2978e36f03e..062d98ad7d7 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.types
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.types
@@ -12,6 +12,6 @@ export class C {
   get x(): number { return 1; }
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/filterNamespace_import.types b/tests/baselines/reference/filterNamespace_import.types
index e533b8328af..739ac3c1c0e 100644
--- a/tests/baselines/reference/filterNamespace_import.types
+++ b/tests/baselines/reference/filterNamespace_import.types
@@ -70,8 +70,8 @@ let t: ns.Type = "";
 >  : ^^^^^^
 >ns : any
 >   : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 let n: ns.nested.NestedClass = { a: '' };
 >n : ns.nested.NestedClass
@@ -84,6 +84,6 @@ let n: ns.nested.NestedClass = { a: '' };
 >          : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/fixSignatureCaching.types b/tests/baselines/reference/fixSignatureCaching.types
index 2060df9f649..4251529b6a0 100644
--- a/tests/baselines/reference/fixSignatureCaching.types
+++ b/tests/baselines/reference/fixSignatureCaching.types
@@ -1927,8 +1927,8 @@ define(function () {
 >       : ^^^
 >key : string
 >    : ^^^^^^
->'i' : string
->    : ^^^^^^
+>'i' : "i"
+>    : ^^^
             }
         }
     }
@@ -2148,8 +2148,8 @@ define(function () {
 >       : ^^^^^^^^^^^^^^^^^
 >value : any
 >      : ^^^
->'i' : string
->    : ^^^^^^
+>'i' : "i"
+>    : ^^^
                 }
                 mobileDetectRules.props[key] = values;
 >mobileDetectRules.props[key] = values : any
@@ -5315,8 +5315,8 @@ define(function () {
 >       : ^^^^^^^^^^^^^^^^^
 >pattern : any
 >        : ^^^
->'i' : string
->    : ^^^^^^
+>'i' : "i"
+>    : ^^^
             }
             return pattern.test(this.ua);
 >pattern.test(this.ua) : any
@@ -5647,8 +5647,8 @@ define(function () {
 >                                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'unknown environment' : string
->                      : ^^^^^^
+>'unknown environment' : "unknown environment"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
     }
 })());
 
diff --git a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
index 62377004701..06c516ecfb1 100644
--- a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
@@ -14,8 +14,8 @@ bar(1, ""); // Should be ok
 >           : ^^^^
 >bar : <T>(item1: T, item2: T) => void
 >    : ^ ^^     ^^ ^^     ^^ ^^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly1.types b/tests/baselines/reference/fixingTypeParametersRepeatedly1.types
index 8e5c9d8562b..fc89accd739 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly1.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly1.types
@@ -20,8 +20,8 @@ f("", x => null, x => x.toLowerCase());
 >                                       : ^^^^^^
 >f : <T>(x: T, y: (p: T) => T, z: (p: T) => T) => T
 >  : ^ ^^ ^^ ^^ ^^           ^^ ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >x => null : (x: string) => any
 >          : ^ ^^^^^^^^^^^^^^^^
 >x : string
diff --git a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types
index 799fa867931..e4ec2fa695c 100644
--- a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types
+++ b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types
@@ -58,8 +58,8 @@ const repro_43249 = (value: unknown) => {
 >                : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"No" : string
->     : ^^^^^^
+>"No" : "No"
+>     : ^^^^
     }
     const match = value.match(/anything/) || [];
 >match : [] | RegExpMatchArray
diff --git a/tests/baselines/reference/for-of36.types b/tests/baselines/reference/for-of36.types
index c8bcfd24c98..75a37bbb854 100644
--- a/tests/baselines/reference/for-of36.types
+++ b/tests/baselines/reference/for-of36.types
@@ -6,8 +6,8 @@ var tuple: [string, boolean] = ["", true];
 >      : ^^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for-of37.types b/tests/baselines/reference/for-of37.types
index 32261eccb6d..82460d9827c 100644
--- a/tests/baselines/reference/for-of37.types
+++ b/tests/baselines/reference/for-of37.types
@@ -12,8 +12,8 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for-of38.types b/tests/baselines/reference/for-of38.types
index 706b21d41a8..10de4684d1f 100644
--- a/tests/baselines/reference/for-of38.types
+++ b/tests/baselines/reference/for-of38.types
@@ -12,8 +12,8 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for-of39.types b/tests/baselines/reference/for-of39.types
index 50c8194c43f..012a3ad5759 100644
--- a/tests/baselines/reference/for-of39.types
+++ b/tests/baselines/reference/for-of39.types
@@ -12,14 +12,14 @@ var map = new Map([["", true], ["", 0]]);
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 >["", 0] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >0 : 0
 >  : ^
 
diff --git a/tests/baselines/reference/for-of40.types b/tests/baselines/reference/for-of40.types
index 90b6451aeec..33e7682d775 100644
--- a/tests/baselines/reference/for-of40.types
+++ b/tests/baselines/reference/for-of40.types
@@ -12,8 +12,8 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for-of44.types b/tests/baselines/reference/for-of44.types
index 8ebfeb476b9..ce589fad855 100644
--- a/tests/baselines/reference/for-of44.types
+++ b/tests/baselines/reference/for-of44.types
@@ -8,20 +8,20 @@ var array: [number, string | boolean | symbol][] = [[0, ""], [0, true], [1, Symb
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, ""] : [number, string]
 >        : ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >"" : ""
 >   : ^^
 >[0, true] : [number, true]
 >          : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >true : true
 >     : ^^^^
 >[1, Symbol()] : [number, symbol]
 >              : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >Symbol() : symbol
 >         : ^^^^^^
 >Symbol : SymbolConstructor
diff --git a/tests/baselines/reference/for-of45.types b/tests/baselines/reference/for-of45.types
index 12dd3cf8c54..0437ee5ba77 100644
--- a/tests/baselines/reference/for-of45.types
+++ b/tests/baselines/reference/for-of45.types
@@ -18,20 +18,20 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
 for ([k = "", v = false] of map) {
 >[k = "", v = false] : [string, boolean]
 >                    : ^^^^^^^^^^^^^^^^^
->k = "" : string
->       : ^^^^^^
+>k = "" : ""
+>       : ^^
 >k : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >v = false : false
 >          : ^^^^^
 >v : boolean
diff --git a/tests/baselines/reference/for-of46.types b/tests/baselines/reference/for-of46.types
index 5645324cd41..b3f244e065f 100644
--- a/tests/baselines/reference/for-of46.types
+++ b/tests/baselines/reference/for-of46.types
@@ -18,8 +18,8 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for-of49.types b/tests/baselines/reference/for-of49.types
index fb78e0c327b..de377863012 100644
--- a/tests/baselines/reference/for-of49.types
+++ b/tests/baselines/reference/for-of49.types
@@ -18,8 +18,8 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for-of50.types b/tests/baselines/reference/for-of50.types
index 478fd74a664..ddc66e9c528 100644
--- a/tests/baselines/reference/for-of50.types
+++ b/tests/baselines/reference/for-of50.types
@@ -12,8 +12,8 @@ var map = new Map([["", true]]);
 >             : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/for.types b/tests/baselines/reference/for.types
index a7e6a10305a..622bf9df712 100644
--- a/tests/baselines/reference/for.types
+++ b/tests/baselines/reference/for.types
@@ -27,8 +27,8 @@ for (var i = 0; i < 10; i++) { // ok
 for (var j: number = 0; j < 10; j++) { // ok
 >j : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >j < 10 : boolean
 >       : ^^^^^^^
 >j : number
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index f131c54810f..2d9fdfc3b34 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -38,8 +38,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 module M {
 >M : typeof M
@@ -72,14 +72,14 @@ module M {
 for(var aNumber: number = 9.9;;){} 
 >aNumber : number
 >        : ^^^^^^
->9.9 : number
->    : ^^^^^^
+>9.9 : 9.9
+>    : ^^^
 
 for(var aString: string = 'this is a string';;){}
 >aString : string
 >        : ^^^^^^
->'this is a string' : string
->                   : ^^^^^^
+>'this is a string' : "this is a string"
+>                   : ^^^^^^^^^^^^^^^^^^
 
 for(var aDate: Date = new Date(12);;){}
 >aDate : Date
@@ -88,8 +88,8 @@ for(var aDate: Date = new Date(12);;){}
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 for(var anObject: Object = new Object();;){}
 >anObject : Object
@@ -144,8 +144,8 @@ for(var anObjectLiteral: I = { id: 12 };;){}
 >           : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 for(var anOtherObjectLiteral: { id: number } = new C();;){}
 >anOtherObjectLiteral : { id: number; }
@@ -182,8 +182,8 @@ for(var aLambda: typeof F = (x) => 2;;){}
 >         : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 for(var aModule: typeof M = M;;){}
 >aModule : typeof M
@@ -220,6 +220,6 @@ for(var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';;){}
 >                          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->'this is a string' : string
->                   : ^^^^^^
+>'this is a string' : "this is a string"
+>                   : ^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.types b/tests/baselines/reference/forStatementsMultipleInvalidDecl.types
index 92aa3b942a1..018d46d9e1f 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.types
@@ -53,8 +53,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 module M {
 >M : typeof M
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index 5c3f73110e9..9c5ef84b62d 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -63,8 +63,8 @@ for (var p: Point = { x: 0, y: undefined }; ;) { }
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
@@ -97,12 +97,12 @@ for (var p: { x: number; y: number; } = { x: 1, y: 2 }; ;) { }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 for (var p = <{ x: number; y: number; }>{ x: 0, y: undefined }; ;) { }
 >p : Point
@@ -117,8 +117,8 @@ for (var p = <{ x: number; y: number; }>{ x: 0, y: undefined }; ;) { }
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types
index 16d7dde2b63..8e72055ce90 100644
--- a/tests/baselines/reference/funcdecl.types
+++ b/tests/baselines/reference/funcdecl.types
@@ -30,8 +30,8 @@ function withReturn() : string{
 >           : ^^^^^^      
 
     return "Hello";
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 }
 var withReturnVar = withReturn;
 >withReturnVar : () => string
@@ -114,8 +114,8 @@ function withOptionalInitializedParams(a: string, c: string = "hello string") {
 >  : ^^^^^^
 >c : string
 >  : ^^^^^^
->"hello string" : string
->               : ^^^^^^
+>"hello string" : "hello string"
+>               : ^^^^^^^^^^^^^^
 }
 var withOptionalInitializedParamsVar = withOptionalInitializedParams;
 >withOptionalInitializedParamsVar : (a: string, c?: string) => void
diff --git a/tests/baselines/reference/functionAssignment.types b/tests/baselines/reference/functionAssignment.types
index bac36509a3d..876013f12ba 100644
--- a/tests/baselines/reference/functionAssignment.types
+++ b/tests/baselines/reference/functionAssignment.types
@@ -92,12 +92,12 @@ f2(() => {
 >   : ^^
 
     n = 4;
->n = 4 : number
->      : ^^^^^^
+>n = 4 : 4
+>      : ^
 >n : string
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 });
 
@@ -120,12 +120,12 @@ f3({ a: 0, b: 0 });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
 function callb(lam:(l: number) => void );
diff --git a/tests/baselines/reference/functionAssignmentError.types b/tests/baselines/reference/functionAssignmentError.types
index a9b96de591d..f5881d7d674 100644
--- a/tests/baselines/reference/functionAssignmentError.types
+++ b/tests/baselines/reference/functionAssignmentError.types
@@ -16,6 +16,6 @@ func = function (){return "ONE";};
 >     : ^^^^^^^^^^^^
 >function (){return "ONE";} : () => string
 >                           : ^^^^^^^^^^^^
->"ONE" : string
->      : ^^^^^^
+>"ONE" : "ONE"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/functionCall10.types b/tests/baselines/reference/functionCall10.types
index ed737aa5bb1..9e13f1ddab5 100644
--- a/tests/baselines/reference/functionCall10.types
+++ b/tests/baselines/reference/functionCall10.types
@@ -12,18 +12,18 @@ foo(0, 1);
 >          : ^^^^
 >foo : (...a: number[]) => void
 >    : ^^^^ ^^        ^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (...a: number[]) => void
 >    : ^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -36,8 +36,8 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (...a: number[]) => void
 >    : ^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/functionCall11.types b/tests/baselines/reference/functionCall11.types
index ac3b8ccd5cc..c590d6696e8 100644
--- a/tests/baselines/reference/functionCall11.types
+++ b/tests/baselines/reference/functionCall11.types
@@ -14,18 +14,18 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a: string, b?: number) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a: string, b?: number) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -38,20 +38,20 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (a: string, b?: number) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 'bar');
 >foo('foo', 1, 'bar') : void
 >                     : ^^^^
 >foo : (a: string, b?: number) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 >'bar' : "bar"
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/functionCall12.types b/tests/baselines/reference/functionCall12.types
index 2bb60a3febd..4de4820389d 100644
--- a/tests/baselines/reference/functionCall12.types
+++ b/tests/baselines/reference/functionCall12.types
@@ -16,18 +16,18 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a: string, b?: number, c?: string) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a: string, b?: number, c?: string) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -40,32 +40,32 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (a: string, b?: number, c?: string) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 'bar');
 >foo('foo', 1, 'bar') : void
 >                     : ^^^^
 >foo : (a: string, b?: number, c?: string) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 3);
 >foo('foo', 1, 3) : void
 >                 : ^^^^
 >foo : (a: string, b?: number, c?: string) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/functionCall13.types b/tests/baselines/reference/functionCall13.types
index daf96f4710a..d5599799e81 100644
--- a/tests/baselines/reference/functionCall13.types
+++ b/tests/baselines/reference/functionCall13.types
@@ -14,18 +14,18 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a: string, ...b: number[]) => void
 >    : ^ ^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a: string, ...b: number[]) => void
 >    : ^ ^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -38,20 +38,20 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (a: string, ...b: number[]) => void
 >    : ^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 3);
 >foo('foo', 1, 3) : void
 >                 : ^^^^
 >foo : (a: string, ...b: number[]) => void
 >    : ^ ^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/functionCall14.types b/tests/baselines/reference/functionCall14.types
index 0b145c82aa1..a745d13c8ef 100644
--- a/tests/baselines/reference/functionCall14.types
+++ b/tests/baselines/reference/functionCall14.types
@@ -14,18 +14,18 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a?: string, ...b: number[]) => void
 >    : ^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a?: string, ...b: number[]) => void
 >    : ^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -38,20 +38,20 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (a?: string, ...b: number[]) => void
 >    : ^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 3);
 >foo('foo', 1, 3) : void
 >                 : ^^^^
 >foo : (a?: string, ...b: number[]) => void
 >    : ^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/functionCall16.types b/tests/baselines/reference/functionCall16.types
index 81abe7d261b..ae77912a545 100644
--- a/tests/baselines/reference/functionCall16.types
+++ b/tests/baselines/reference/functionCall16.types
@@ -16,28 +16,28 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a: string, b?: string, ...c: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a: string, b?: string, ...c: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo('foo', 'bar'); 
 >foo('foo', 'bar') : void
 >                  : ^^^^
 >foo : (a: string, b?: string, ...c: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -50,20 +50,20 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (a: string, b?: string, ...c: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 'bar', 3);
 >foo('foo', 'bar', 3) : void
 >                     : ^^^^
 >foo : (a: string, b?: string, ...c: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->'bar' : string
->      : ^^^^^^
->3 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>'bar' : "bar"
+>      : ^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/functionCall17.types b/tests/baselines/reference/functionCall17.types
index b288db53ccd..374fc8baa30 100644
--- a/tests/baselines/reference/functionCall17.types
+++ b/tests/baselines/reference/functionCall17.types
@@ -18,18 +18,18 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a: string, b?: string, c?: number, ...d: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a: string, b?: string, c?: number, ...d: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo();
 >foo() : void
@@ -42,34 +42,34 @@ foo(1, 'bar');
 >              : ^^^^
 >foo : (a: string, b?: string, c?: number, ...d: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 3);
 >foo('foo', 1, 3) : void
 >                 : ^^^^
 >foo : (a: string, b?: string, c?: number, ...d: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>3 : 3
+>  : ^
 
 foo('foo', 'bar', 3, 4);
 >foo('foo', 'bar', 3, 4) : void
 >                        : ^^^^
 >foo : (a: string, b?: string, c?: number, ...d: number[]) => void
 >    : ^ ^^      ^^ ^^^      ^^ ^^^      ^^^^^ ^^        ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->'bar' : string
->      : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>'bar' : "bar"
+>      : ^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
diff --git a/tests/baselines/reference/functionCall18.types b/tests/baselines/reference/functionCall18.types
index e812f85614c..3b2a153d13a 100644
--- a/tests/baselines/reference/functionCall18.types
+++ b/tests/baselines/reference/functionCall18.types
@@ -21,6 +21,6 @@ foo<string>("hello");
 >                     : ^^^
 >foo : { <T>(a: T, b: T): any; (a: {}): any; }
 >    : ^^^ ^^ ^^ ^^ ^^ ^^^^^^^^^ ^^  ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/functionCall2.types b/tests/baselines/reference/functionCall2.types
index 8beb3077140..db333124091 100644
--- a/tests/baselines/reference/functionCall2.types
+++ b/tests/baselines/reference/functionCall2.types
@@ -4,8 +4,8 @@
 function foo():number{return 1}; 
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var x = foo();
 >x : number
diff --git a/tests/baselines/reference/functionCall6.types b/tests/baselines/reference/functionCall6.types
index 880d26c2335..9c7f134b9c0 100644
--- a/tests/baselines/reference/functionCall6.types
+++ b/tests/baselines/reference/functionCall6.types
@@ -12,24 +12,24 @@ foo('bar');
 >           : ^^^^
 >foo : (a: string) => void
 >    : ^ ^^      ^^^^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo(2);
 >foo(2) : void
 >       : ^^^^
 >foo : (a: string) => void
 >    : ^ ^^      ^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 foo('foo', 'bar');
 >foo('foo', 'bar') : void
 >                  : ^^^^
 >foo : (a: string) => void
 >    : ^ ^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 >'bar' : "bar"
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/functionCall8.types b/tests/baselines/reference/functionCall8.types
index 57c38a53250..fd711a7cde3 100644
--- a/tests/baselines/reference/functionCall8.types
+++ b/tests/baselines/reference/functionCall8.types
@@ -12,16 +12,16 @@ foo('foo');
 >           : ^^^^
 >foo : (a?: string) => void
 >    : ^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo('foo', 'bar'); 
 >foo('foo', 'bar') : void
 >                  : ^^^^
 >foo : (a?: string) => void
 >    : ^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 >'bar' : "bar"
 >      : ^^^^^
 
@@ -30,8 +30,8 @@ foo(4);
 >       : ^^^^
 >foo : (a?: string) => void
 >    : ^ ^^^      ^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 foo();
 >foo() : void
diff --git a/tests/baselines/reference/functionCall9.types b/tests/baselines/reference/functionCall9.types
index 2759ec5ccbe..e07225e3a82 100644
--- a/tests/baselines/reference/functionCall9.types
+++ b/tests/baselines/reference/functionCall9.types
@@ -14,38 +14,38 @@ foo('foo', 1);
 >              : ^^^^
 >foo : (a?: string, b?: number) => void
 >    : ^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 foo('foo'); 
 >foo('foo') : void
 >           : ^^^^
 >foo : (a?: string, b?: number) => void
 >    : ^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 foo('foo','bar');
 >foo('foo','bar') : void
 >                 : ^^^^
 >foo : (a?: string, b?: number) => void
 >    : ^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 foo('foo', 1, 'bar');
 >foo('foo', 1, 'bar') : void
 >                     : ^^^^
 >foo : (a?: string, b?: number) => void
 >    : ^ ^^^      ^^ ^^^      ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>1 : 1
+>  : ^
 >'bar' : "bar"
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types b/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types
index df76ec271c5..2ac93d292c1 100644
--- a/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types
+++ b/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types
@@ -41,8 +41,8 @@ function call0(p: A | B) {
 >  : ^^^^^
 >a : ((x: number) => string) | ((x: boolean) => string)
 >  : ^^ ^^      ^^^^^      ^^^^^^ ^^       ^^^^^      ^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 }
 
 function callN<T extends A | B>(p: T) {
@@ -60,8 +60,8 @@ function callN<T extends A | B>(p: T) {
 >  : ^^^^^
 >a : ((x: number) => string) | ((x: boolean) => string)
 >  : ^^ ^^      ^^^^^      ^^^^^^ ^^       ^^^^^      ^
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
   
   var a: T["a"] = p.a;
 >a : T["a"]
@@ -78,16 +78,16 @@ function callN<T extends A | B>(p: T) {
 >      : ^^^^^^
 >a : ((x: number) => string) | ((x: boolean) => string)
 >  : ^^ ^^      ^^^^^      ^^^^^^ ^^       ^^^^^      ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   a("", "", "", ""); // Error
 >a("", "", "", "") : string
 >                  : ^^^^^^
 >a : ((x: number) => string) | ((x: boolean) => string)
 >  : ^^ ^^      ^^^^^      ^^^^^^ ^^       ^^^^^      ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >"" : ""
 >   : ^^
 >"" : ""
diff --git a/tests/baselines/reference/functionExpressionContextualTyping1.types b/tests/baselines/reference/functionExpressionContextualTyping1.types
index 5f095aa7249..00d145d03c6 100644
--- a/tests/baselines/reference/functionExpressionContextualTyping1.types
+++ b/tests/baselines/reference/functionExpressionContextualTyping1.types
@@ -40,8 +40,8 @@ var a0: (n: number, s: string) => number = (num, str) => {
 >              : ^              ^^^      ^^^^^      
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class Class<T> {
@@ -74,8 +74,8 @@ var a1: (c: Class<Number>) => number = (a1) => {
 >    : ^^^^^^^^^^
 
     return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 // A contextual signature S is extracted from a function type T as follows:
@@ -146,8 +146,8 @@ b2 = (foo, bar) => { return "hello"; }
 >    : ^^^^^^
 >bar : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var b3: (name: string, num: number, boo: boolean) => void;
 >b3 : (name: string, num: number, boo: boolean) => void
@@ -182,8 +182,8 @@ var b4: (n: E) => string = (number = 1) => { return "hello"; };
 >       : ^
 >1 : 1
 >  : ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var b5: (n: {}) => string = (number = "string") => { return "hello"; };
 >b5 : (n: {}) => string
@@ -196,8 +196,8 @@ var b5: (n: {}) => string = (number = "string") => { return "hello"; };
 >       : ^^
 >"string" : "string"
 >         : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 // A contextual signature S is extracted from a function type T as follows:
 //      Otherwise, no contextual signature can be extracted from T and S is undefined.
diff --git a/tests/baselines/reference/functionExpressionShadowedByParams.types b/tests/baselines/reference/functionExpressionShadowedByParams.types
index 90569f75b50..8053651b11e 100644
--- a/tests/baselines/reference/functionExpressionShadowedByParams.types
+++ b/tests/baselines/reference/functionExpressionShadowedByParams.types
@@ -16,8 +16,8 @@ function b1(b1: number) {
 >   : ^^^^^^
 >toPrecision : (precision?: number) => string
 >            : ^         ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
    b1(12); // should error
 >b1(12) : any
@@ -54,8 +54,8 @@ var x = {
 >  : ^^^^^^
 >toPrecision : (precision?: number) => string
 >            : ^         ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
       b.apply(null, null); // should error
 >b.apply(null, null) : any
diff --git a/tests/baselines/reference/functionOnlyHasThrow.types b/tests/baselines/reference/functionOnlyHasThrow.types
index c09ff2bf1d1..2307850c3fd 100644
--- a/tests/baselines/reference/functionOnlyHasThrow.types
+++ b/tests/baselines/reference/functionOnlyHasThrow.types
@@ -10,6 +10,6 @@ function clone():number {
 >                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"To be implemented" : string
->                    : ^^^^^^
+>"To be implemented" : "To be implemented"
+>                    : ^^^^^^^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types
index d6a84853df2..9b340d4ee13 100644
--- a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types
+++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types
@@ -14,6 +14,6 @@ function f(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 } 
diff --git a/tests/baselines/reference/functionOverloads.types b/tests/baselines/reference/functionOverloads.types
index f3a6f770027..3ec1de55d11 100644
--- a/tests/baselines/reference/functionOverloads.types
+++ b/tests/baselines/reference/functionOverloads.types
@@ -26,6 +26,6 @@ var x = foo(5);
 >       : ^^^^^
 >foo : { (): string; (bar: string): number; }
 >    : ^^^^^^      ^^^   ^^      ^^^      ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/functionOverloads1.types b/tests/baselines/reference/functionOverloads1.types
index d2a4db69620..6bd139afde2 100644
--- a/tests/baselines/reference/functionOverloads1.types
+++ b/tests/baselines/reference/functionOverloads1.types
@@ -16,6 +16,6 @@ function foo();
 function foo():string { return "a" }
 >foo : { (): any; (): string; }
 >    : ^^^^^^^^^^^^^^^      ^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/functionOverloads11.types b/tests/baselines/reference/functionOverloads11.types
index 73306942c86..44f402b418d 100644
--- a/tests/baselines/reference/functionOverloads11.types
+++ b/tests/baselines/reference/functionOverloads11.types
@@ -8,6 +8,6 @@ function foo():number;
 function foo():string { return "" }
 >foo : () => number
 >    : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/functionOverloads17.types b/tests/baselines/reference/functionOverloads17.types
index 907faa67c03..dd12ad7a970 100644
--- a/tests/baselines/reference/functionOverloads17.types
+++ b/tests/baselines/reference/functionOverloads17.types
@@ -16,6 +16,6 @@ function foo():{a:string;} { return {a:""} }
 >       : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/functionOverloads20.types b/tests/baselines/reference/functionOverloads20.types
index 4e32e855dbd..ea0feebf9d3 100644
--- a/tests/baselines/reference/functionOverloads20.types
+++ b/tests/baselines/reference/functionOverloads20.types
@@ -24,6 +24,6 @@ function foo(bar:{a:any;}): string {return ""}
 >    : ^^^^^   ^^^
 >a : any
 >  : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/functionOverloads26.types b/tests/baselines/reference/functionOverloads26.types
index b6f3a790041..e61b3008d97 100644
--- a/tests/baselines/reference/functionOverloads26.types
+++ b/tests/baselines/reference/functionOverloads26.types
@@ -25,6 +25,6 @@ var x = foo('baz');
 >           : ^^^^^^
 >foo : { (): string; (bar: string): number; }
 >    : ^^^^^^      ^^^   ^^      ^^^      ^^^
->'baz' : string
->      : ^^^^^^
+>'baz' : "baz"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/functionOverloads27.types b/tests/baselines/reference/functionOverloads27.types
index 506b5d85041..eb51f8e5742 100644
--- a/tests/baselines/reference/functionOverloads27.types
+++ b/tests/baselines/reference/functionOverloads27.types
@@ -26,6 +26,6 @@ var x = foo(5);
 >       : ^^^^^
 >foo : { (): string; (bar: string): number; }
 >    : ^^^^^^      ^^^   ^^      ^^^      ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/functionOverloads30.types b/tests/baselines/reference/functionOverloads30.types
index 3520816dda0..b7308c80d46 100644
--- a/tests/baselines/reference/functionOverloads30.types
+++ b/tests/baselines/reference/functionOverloads30.types
@@ -26,6 +26,6 @@ var x = foo('bar');
 >           : ^^^^^^
 >foo : { (bar: string): string; (bar: number): number; }
 >    : ^^^   ^^      ^^^      ^^^   ^^      ^^^      ^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/functionOverloads31.types b/tests/baselines/reference/functionOverloads31.types
index 10d1158f72f..668e742d8cd 100644
--- a/tests/baselines/reference/functionOverloads31.types
+++ b/tests/baselines/reference/functionOverloads31.types
@@ -26,6 +26,6 @@ var x = foo(5);
 >       : ^^^^^^
 >foo : { (bar: string): string; (bar: number): number; }
 >    : ^^^   ^^      ^^^      ^^^   ^^      ^^^      ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/functionOverloads35.types b/tests/baselines/reference/functionOverloads35.types
index d2c454651ca..73e9185940b 100644
--- a/tests/baselines/reference/functionOverloads35.types
+++ b/tests/baselines/reference/functionOverloads35.types
@@ -37,6 +37,6 @@ var x = foo({a:1});
 >      : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/functionOverloads36.types b/tests/baselines/reference/functionOverloads36.types
index 51227f8e649..d095cfc1797 100644
--- a/tests/baselines/reference/functionOverloads36.types
+++ b/tests/baselines/reference/functionOverloads36.types
@@ -37,6 +37,6 @@ var x = foo({a:'foo'});
 >          : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/functionOverloads38.types b/tests/baselines/reference/functionOverloads38.types
index 31ef2bac276..17c6afe84e1 100644
--- a/tests/baselines/reference/functionOverloads38.types
+++ b/tests/baselines/reference/functionOverloads38.types
@@ -39,6 +39,6 @@ var x = foo([{a:1}]);
 >      : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/functionOverloads4.types b/tests/baselines/reference/functionOverloads4.types
index 2d37454ad94..afdc1703041 100644
--- a/tests/baselines/reference/functionOverloads4.types
+++ b/tests/baselines/reference/functionOverloads4.types
@@ -8,6 +8,6 @@ function foo():number;
 function foo():string { return "a" }
 >foo : () => number
 >    : ^^^^^^      
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/functionOverloads43.types b/tests/baselines/reference/functionOverloads43.types
index d316e0133f6..9adb503f5b9 100644
--- a/tests/baselines/reference/functionOverloads43.types
+++ b/tests/baselines/reference/functionOverloads43.types
@@ -56,8 +56,8 @@ var x = foo([{a: "str"}]);
 >           : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
 var y = foo([{a: 100}]);
 >y : number
@@ -72,6 +72,6 @@ var y = foo([{a: 100}]);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
diff --git a/tests/baselines/reference/functionOverloads44.types b/tests/baselines/reference/functionOverloads44.types
index 4bc9e57930c..331024b7615 100644
--- a/tests/baselines/reference/functionOverloads44.types
+++ b/tests/baselines/reference/functionOverloads44.types
@@ -82,8 +82,8 @@ var x1 = foo1([{a: "str"}]);
 >           : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
 var y1 = foo1([{a: 100}]);
 >y1 : Dog
@@ -98,8 +98,8 @@ var y1 = foo1([{a: 100}]);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 var x2 = foo2([{a: "str"}]);
 >x2 : Dog | Cat
@@ -114,8 +114,8 @@ var x2 = foo2([{a: "str"}]);
 >           : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
 var y2 = foo2([{a: 100}]);
 >y2 : Cat
@@ -130,6 +130,6 @@ var y2 = foo2([{a: 100}]);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
diff --git a/tests/baselines/reference/functionOverloads45.types b/tests/baselines/reference/functionOverloads45.types
index 92f1048f48a..67b493dafdf 100644
--- a/tests/baselines/reference/functionOverloads45.types
+++ b/tests/baselines/reference/functionOverloads45.types
@@ -82,8 +82,8 @@ var x1 = foo1([{a: "str"}]);
 >           : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
 var y1 = foo1([{a: 100}]);
 >y1 : Cat
@@ -98,8 +98,8 @@ var y1 = foo1([{a: 100}]);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 var x2 = foo2([{a: "str"}]);
 >x2 : Dog
@@ -114,8 +114,8 @@ var x2 = foo2([{a: "str"}]);
 >           : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
 var y2 = foo2([{a: 100}]);
 >y2 : Cat
@@ -130,6 +130,6 @@ var y2 = foo2([{a: 100}]);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
diff --git a/tests/baselines/reference/functionOverloads7.types b/tests/baselines/reference/functionOverloads7.types
index 1159eedaca8..98bc125ca8a 100644
--- a/tests/baselines/reference/functionOverloads7.types
+++ b/tests/baselines/reference/functionOverloads7.types
@@ -46,7 +46,7 @@ class foo {
 >     : ^^^^
 >bar : { (): any; (foo: string): any; }
 >    : ^^^^^^^^^^^^   ^^      ^^^^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
    }
 }
diff --git a/tests/baselines/reference/functionOverloads9.types b/tests/baselines/reference/functionOverloads9.types
index 8f27d46d0b3..178ddb306a4 100644
--- a/tests/baselines/reference/functionOverloads9.types
+++ b/tests/baselines/reference/functionOverloads9.types
@@ -20,6 +20,6 @@ var x = foo('foo');
 >foo('foo') : any
 >foo : (foo: string) => any
 >    : ^   ^^      ^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/functionParameterArityMismatch.types b/tests/baselines/reference/functionParameterArityMismatch.types
index 59213fcdc16..1b3d620f069 100644
--- a/tests/baselines/reference/functionParameterArityMismatch.types
+++ b/tests/baselines/reference/functionParameterArityMismatch.types
@@ -28,22 +28,22 @@ f1(1, 2);
 >         : ^^^
 >f1 : { (a: number): any; (a: number, b: number, c: number): any; }
 >   : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f1(1, 2, 3, 4);
 >f1(1, 2, 3, 4) : any
 >               : ^^^
 >f1 : { (a: number): any; (a: number, b: number, c: number): any; }
 >   : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >4 : 4
 >  : ^
 
@@ -92,54 +92,54 @@ f2(1);
 >      : ^^^
 >f2 : { (): any; (a: number, b: number): any; (a: number, b: number, c: number, d: number): any; (a: number, b: number, c: number, d: number, e: number, f: number): any; }
 >   : ^^^^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f2(1, 2, 3);
 >f2(1, 2, 3) : any
 >            : ^^^
 >f2 : { (): any; (a: number, b: number): any; (a: number, b: number, c: number, d: number): any; (a: number, b: number, c: number, d: number, e: number, f: number): any; }
 >   : ^^^^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 f2(1, 2, 3, 4, 5);
 >f2(1, 2, 3, 4, 5) : any
 >                  : ^^^
 >f2 : { (): any; (a: number, b: number): any; (a: number, b: number, c: number, d: number): any; (a: number, b: number, c: number, d: number, e: number, f: number): any; }
 >   : ^^^^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
 
 f2(1, 2, 3, 4, 5, 6, 7);
 >f2(1, 2, 3, 4, 5, 6, 7) : any
 >                        : ^^^
 >f2 : { (): any; (a: number, b: number): any; (a: number, b: number, c: number, d: number): any; (a: number, b: number, c: number, d: number, e: number, f: number): any; }
 >   : ^^^^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 >7 : 7
 >  : ^
 
@@ -148,16 +148,16 @@ f2(1, 2, 3, 4, 5, ...[6, 7]);
 >                             : ^^^
 >f2 : { (): any; (a: number, b: number): any; (a: number, b: number, c: number, d: number): any; (a: number, b: number, c: number, d: number, e: number, f: number): any; }
 >   : ^^^^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
 >...[6, 7] : number
 >          : ^^^^^^
 >[6, 7] : [number, number]
diff --git a/tests/baselines/reference/functionReturn.types b/tests/baselines/reference/functionReturn.types
index 3e87d112471..0d120b9bcb0 100644
--- a/tests/baselines/reference/functionReturn.types
+++ b/tests/baselines/reference/functionReturn.types
@@ -29,8 +29,8 @@ function f4(): string {
 >   : ^^^^^^      
 
     return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     return;
 }
@@ -39,8 +39,8 @@ function f5(): string {
 >   : ^^^^^^      
 
     return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/functionType.types b/tests/baselines/reference/functionType.types
index f95152fc77b..7f85509b5c6 100644
--- a/tests/baselines/reference/functionType.types
+++ b/tests/baselines/reference/functionType.types
@@ -26,8 +26,8 @@ salt.apply("hello", []);
 >                         : ^^^^^^^^
 >Function : FunctionConstructor
 >         : ^^^^^^^^^^^^^^^^^^^
->"return 5" : string
->           : ^^^^^^
+>"return 5" : "return 5"
+>           : ^^^^^^^^^^
  
  
 
diff --git a/tests/baselines/reference/functionWithThrowButNoReturn1.types b/tests/baselines/reference/functionWithThrowButNoReturn1.types
index a6d2ea5ac86..de65f2cee79 100644
--- a/tests/baselines/reference/functionWithThrowButNoReturn1.types
+++ b/tests/baselines/reference/functionWithThrowButNoReturn1.types
@@ -10,8 +10,8 @@ function fn(): number {
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'NYI' : string
->      : ^^^^^^
+>'NYI' : "NYI"
+>      : ^^^^^
 
   var t;
 >t : any
diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.types b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.types
index 63d12242fb1..26e2c3f114b 100644
--- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.types
+++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.types
@@ -21,8 +21,8 @@ function f3(): string {
 >   : ^^^^^^      
 
     return "Okay, because this is a return expression.";
->"Okay, because this is a return expression." : string
->                                             : ^^^^^^
+>"Okay, because this is a return expression." : "Okay, because this is a return expression."
+>                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
 function f4(): void {
diff --git a/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=false).types b/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=false).types
index 849185224fa..d16181ed998 100644
--- a/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=false).types
+++ b/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=false).types
@@ -154,8 +154,8 @@ function f8(): string | null {
 >       : ^^^^^^      
 >0.5 : 0.5
 >    : ^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
     // Implicit return, but undefined is assignable to null when strictNullChecks is off.
 }
diff --git a/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=true).types b/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=true).types
index 849185224fa..d16181ed998 100644
--- a/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=true).types
+++ b/tests/baselines/reference/functionsWithImplicitReturnTypeAssignableToUndefined(strictnullchecks=true).types
@@ -154,8 +154,8 @@ function f8(): string | null {
 >       : ^^^^^^      
 >0.5 : 0.5
 >    : ^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
     // Implicit return, but undefined is assignable to null when strictNullChecks is off.
 }
diff --git a/tests/baselines/reference/fuzzy.types b/tests/baselines/reference/fuzzy.types
index 479d56d84f1..184c666e0c1 100644
--- a/tests/baselines/reference/fuzzy.types
+++ b/tests/baselines/reference/fuzzy.types
@@ -50,8 +50,8 @@ module M {
 >                : ^^^^^^^^^^^^^^^^^^^^^
 >anything : number
 >         : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
 
         doesntWork():R {
@@ -63,8 +63,8 @@ module M {
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >anything : number
 >         : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >oneI : this
 >     : ^^^^
 >this : this
diff --git a/tests/baselines/reference/generatorExplicitReturnType.types b/tests/baselines/reference/generatorExplicitReturnType.types
index 1ea3a800b28..148944aa16e 100644
--- a/tests/baselines/reference/generatorExplicitReturnType.types
+++ b/tests/baselines/reference/generatorExplicitReturnType.types
@@ -12,16 +12,16 @@ function* g1(): Generator<number, boolean, string> {
     yield "a"; // error
 >yield "a" : string
 >          : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
     const x: number = yield 1; // error
 >x : number
 >  : ^^^^^^
 >yield 1 : string
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     return 10; // error
 >10 : 10
@@ -37,8 +37,8 @@ function* g2(): Generator<number, boolean, string> {
 >  : ^^^^^^
 >yield 1 : string
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     return true;
 >true : true
diff --git a/tests/baselines/reference/generatorReturnTypeFallback.5.types b/tests/baselines/reference/generatorReturnTypeFallback.5.types
index f65aa3e6266..7d85ccb1af7 100644
--- a/tests/baselines/reference/generatorReturnTypeFallback.5.types
+++ b/tests/baselines/reference/generatorReturnTypeFallback.5.types
@@ -9,6 +9,6 @@ function* f(): IterableIterator<number> {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/generatorTransformFinalLabel.types b/tests/baselines/reference/generatorTransformFinalLabel.types
index 7a310ba8bce..af4ab142de8 100644
--- a/tests/baselines/reference/generatorTransformFinalLabel.types
+++ b/tests/baselines/reference/generatorTransformFinalLabel.types
@@ -25,7 +25,7 @@ async function test(skip: boolean) {
 >              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
     }
 }
diff --git a/tests/baselines/reference/generatorTypeCheck13.types b/tests/baselines/reference/generatorTypeCheck13.types
index c8fce4f55eb..85f6e91aefd 100644
--- a/tests/baselines/reference/generatorTypeCheck13.types
+++ b/tests/baselines/reference/generatorTypeCheck13.types
@@ -8,8 +8,8 @@ function* g(): IterableIterator<number> {
     yield 0;
 >yield 0 : undefined
 >        : ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     return "";
 >"" : ""
diff --git a/tests/baselines/reference/generatorTypeCheck45.types b/tests/baselines/reference/generatorTypeCheck45.types
index 6739e9b8362..d8577d007c9 100644
--- a/tests/baselines/reference/generatorTypeCheck45.types
+++ b/tests/baselines/reference/generatorTypeCheck45.types
@@ -20,8 +20,8 @@ foo("", function* () { yield x => x.length }, p => undefined); // T is fixed, sh
 >                                                              : ^^^^^^
 >foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U) => T) => T
 >    : ^ ^^ ^^ ^^ ^^   ^^                           ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >function* () { yield x => x.length } : () => Generator<(x: string) => number, void, undefined>
 >                                     : ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield x => x.length : undefined
diff --git a/tests/baselines/reference/generatorTypeCheck46.types b/tests/baselines/reference/generatorTypeCheck46.types
index fdc42905231..681fe2cb930 100644
--- a/tests/baselines/reference/generatorTypeCheck46.types
+++ b/tests/baselines/reference/generatorTypeCheck46.types
@@ -20,8 +20,8 @@ foo("", function* () {
 >                                                                                                                                : ^^^^^^
 >foo : <T, U>(x: T, fun: () => Iterable<(x: T) => U>, fun2: (y: U) => T) => T
 >    : ^ ^^ ^^ ^^ ^^   ^^                           ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >function* () {    yield* {        *[Symbol.iterator]() {            yield x => x.length        }    }} : () => Generator<(x: string) => number, void, undefined>
 >                                                                                                       : ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/generatorTypeCheck62.types b/tests/baselines/reference/generatorTypeCheck62.types
index a7e729f5e1a..6cf1b381d66 100644
--- a/tests/baselines/reference/generatorTypeCheck62.types
+++ b/tests/baselines/reference/generatorTypeCheck62.types
@@ -79,8 +79,8 @@ export const Nothing1: Strategy<State> = strategy("Nothing", function*(state: St
 >                                                                 : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function*(state: State) {    return state;} : (state: State) => Generator<never, State, undefined>
 >                                            : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
@@ -99,8 +99,8 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: St
 >                                                                : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function*(state: State) {    yield state;} : (state: State) => Generator<State, void, undefined>
 >                                           : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
@@ -121,8 +121,8 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >                                                                             : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function* (state: State) {    yield ;    return state;} : (state: State) => Generator<any, State, undefined>
 >                                                        : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
diff --git a/tests/baselines/reference/generatorTypeCheck63.types b/tests/baselines/reference/generatorTypeCheck63.types
index f9dd4f58044..9efb4d642b8 100644
--- a/tests/baselines/reference/generatorTypeCheck63.types
+++ b/tests/baselines/reference/generatorTypeCheck63.types
@@ -79,8 +79,8 @@ export const Nothing: Strategy<State> = strategy("Nothing", function* (state: St
 >                                                                              : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function* (state: State) {    yield 1;    return state;} : (state: State) => Generator<number, State, undefined>
 >                                                         : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
@@ -105,8 +105,8 @@ export const Nothing1: Strategy<State> = strategy("Nothing", function* (state: S
 >                                                 : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function* (state: State) {} : (state: State) => Generator<never, void, undefined>
 >                            : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
@@ -121,8 +121,8 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function* (state: S
 >                                                              : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function* (state: State) {    return 1;} : (state: State) => Generator<never, number, undefined>
 >                                         : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
@@ -141,8 +141,8 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >                                                                              : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>) => (a: T) => IterableIterator<T | undefined>
 >         : ^ ^^^^^^^^^              ^^         ^^      ^^   ^^                                         ^^^^^                                         
->"Nothing" : string
->          : ^^^^^^
+>"Nothing" : "Nothing"
+>          : ^^^^^^^^^
 >function* (state: State) {    yield state;    return 1;} : (state: State) => Generator<State, number, undefined>
 >                                                         : ^     ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >state : State
diff --git a/tests/baselines/reference/generatorYieldContextualType.types b/tests/baselines/reference/generatorYieldContextualType.types
index cdef457bacf..70ee0b52e5c 100644
--- a/tests/baselines/reference/generatorYieldContextualType.types
+++ b/tests/baselines/reference/generatorYieldContextualType.types
@@ -191,8 +191,8 @@ namespace StepResult {
 >                    : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"BreakStep" : string
->            : ^^^^^^
+>"BreakStep" : "BreakStep"
+>            : ^^^^^^^^^^^
 }
 type StepResult<T> = typeof StepResult.Break | T;
 >StepResult : StepResult<T>
@@ -326,14 +326,14 @@ function* showStep<
     title: "",
 >title : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     placeholder: "",
 >placeholder : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   });
   const selection: StepSelection<typeof step> = yield step;
diff --git a/tests/baselines/reference/generic.types b/tests/baselines/reference/generic.types
index a1a7b7d5444..150a4492e6e 100644
--- a/tests/baselines/reference/generic.types
+++ b/tests/baselines/reference/generic.types
@@ -29,8 +29,8 @@ let a: A<string> = { a: "" };
 >          : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 let b: B<number> = { a: 3 };
 >b : A<number>
@@ -39,8 +39,8 @@ let b: B<number> = { a: 3 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 let c: A<boolean> = {};
 >c : A<boolean>
diff --git a/tests/baselines/reference/genericAndNonGenericOverload1.types b/tests/baselines/reference/genericAndNonGenericOverload1.types
index 791ad5f4791..5bba93c8bcf 100644
--- a/tests/baselines/reference/genericAndNonGenericOverload1.types
+++ b/tests/baselines/reference/genericAndNonGenericOverload1.types
@@ -19,6 +19,6 @@ c2<string>(1);
 >              : ^^^^^^
 >c2 : callable2<number>
 >   : ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericArrayMethods1.types b/tests/baselines/reference/genericArrayMethods1.types
index 42b6d111343..d8f30c0cd4e 100644
--- a/tests/baselines/reference/genericArrayMethods1.types
+++ b/tests/baselines/reference/genericArrayMethods1.types
@@ -16,6 +16,6 @@ var x:string[] =  [0,1].slice(0); // this should be an error
 >  : ^
 >slice : (start?: number, end?: number) => number[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/genericCallInferenceWithGenericLocalFunction.types b/tests/baselines/reference/genericCallInferenceWithGenericLocalFunction.types
index 25c5c66d3ad..a49703b695d 100644
--- a/tests/baselines/reference/genericCallInferenceWithGenericLocalFunction.types
+++ b/tests/baselines/reference/genericCallInferenceWithGenericLocalFunction.types
@@ -57,8 +57,8 @@ const addP2 = withP2({ foo: 1 });
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const added2 = addP2({ bar: 2 });
 >added2 : { bar: number; } & { foo: number; }
@@ -71,6 +71,6 @@ const added2 = addP2({ bar: 2 });
 >           : ^^^^^^^^^^^^^^^^
 >bar : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/genericCallOnMemberReturningClosedOverObject.types b/tests/baselines/reference/genericCallOnMemberReturningClosedOverObject.types
index 391e3c90f08..e75c79c9afd 100644
--- a/tests/baselines/reference/genericCallOnMemberReturningClosedOverObject.types
+++ b/tests/baselines/reference/genericCallOnMemberReturningClosedOverObject.types
@@ -54,10 +54,10 @@ example<number>().foo("hello").bar(1);
 >        : ^  ^^^^^^^^^^^^^^^  ^^  ^^  ^^^^^^^^^^^^^^^^  ^^  ^^^^^^^^^^^
 >foo : <T2>(t2: T2) => { foo: any; bar: (t1: number) => any; }
 >    : ^  ^^  ^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >bar : (t1: number) => { foo: <T2>(t2: T2) => any; bar: any; }
 >    : ^  ^^^^^^^^^^^^^^^^^^^^^  ^^  ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.types b/tests/baselines/reference/genericCallTypeArgumentInference.types
index accb8875b74..5864ec46c92 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.types
@@ -59,8 +59,8 @@ var r2 = foo2('', 1); // number
 >            : ^
 >foo2 : <T, U>(t: T, u: U) => U
 >     : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >1 : 1
 >  : ^
 
@@ -71,8 +71,8 @@ var r3 = foo2b(1); // {}
 >         : ^^^^^^^
 >foo2b : <T, U>(u: U) => T
 >      : ^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C<T, U> {
 >C : C<T, U>
@@ -199,10 +199,10 @@ var c = new C('', 1);
 >             : ^^^^^^^^^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 var r4 = c.foo('', 1); // string
 >r4 : string
@@ -215,10 +215,10 @@ var r4 = c.foo('', 1); // string
 >  : ^^^^^^^^^^^^^^^^^
 >foo : (t: string, u: number) => string
 >    : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 var r5 = c.foo2('', 1); // number
 >r5 : number
@@ -231,10 +231,10 @@ var r5 = c.foo2('', 1); // number
 >  : ^^^^^^^^^^^^^^^^^
 >foo2 : (t: string, u: number) => number
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 var r6 = c.foo3(true, 1); // boolean
 >r6 : boolean
@@ -249,8 +249,8 @@ var r6 = c.foo3(true, 1); // boolean
 >     : ^ ^^ ^^^^^ ^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r7 = c.foo4('', true); // string
 >r7 : string
@@ -263,8 +263,8 @@ var r7 = c.foo4('', true); // string
 >  : ^^^^^^^^^^^^^^^^^
 >foo4 : <U>(t: string, u: U) => string
 >     : ^ ^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
@@ -281,8 +281,8 @@ var r8 = c.foo5(true, 1); // boolean
 >     : ^ ^^ ^^ ^^^^^ ^^^^^^^^^
 >true : true
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r9 = c.foo6(); // {}
 >r9 : unknown
@@ -307,8 +307,8 @@ var r10 = c.foo7(''); // {}
 >  : ^^^^^^^^^^^^^^^^^
 >foo7 : <T, U>(u: U) => T
 >     : ^ ^^ ^^ ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r11 = c.foo8(); // {}
 >r11 : unknown
@@ -399,10 +399,10 @@ var r4 = i.foo('', 1); // string
 >  : ^^^^^^^^^^^^^^^^^
 >foo : (t: string, u: number) => string
 >    : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 var r5 = i.foo2('', 1); // number
 >r5 : number
@@ -415,10 +415,10 @@ var r5 = i.foo2('', 1); // number
 >  : ^^^^^^^^^^^^^^^^^
 >foo2 : (t: string, u: number) => number
 >     : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 var r6 = i.foo3(true, 1); // boolean
 >r6 : boolean
@@ -433,8 +433,8 @@ var r6 = i.foo3(true, 1); // boolean
 >     : ^ ^^ ^^^^^ ^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r7 = i.foo4('', true); // string
 >r7 : string
@@ -447,8 +447,8 @@ var r7 = i.foo4('', true); // string
 >  : ^^^^^^^^^^^^^^^^^
 >foo4 : <U>(t: string, u: U) => string
 >     : ^ ^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >true : true
 >     : ^^^^
 
@@ -465,8 +465,8 @@ var r8 = i.foo5(true, 1); // boolean
 >     : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >true : true
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r9 = i.foo6(); // {}
 >r9 : unknown
@@ -491,8 +491,8 @@ var r10 = i.foo7(''); // {}
 >  : ^^^^^^^^^^^^^^^^^
 >foo7 : <T, U>(u: U) => T
 >     : ^ ^^ ^^ ^^ ^^^^^ 
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r11 = i.foo8(); // {}
 >r11 : unknown
diff --git a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
index ea2619789b5..f5e5a03e445 100644
--- a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
@@ -21,10 +21,10 @@ var r = foo([1, 2]); // number[]
 >    : ^ ^^ ^^ ^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var r = foo<number[]>([1, 2]); // number[]
 >r : number[]
@@ -35,10 +35,10 @@ var r = foo<number[]>([1, 2]); // number[]
 >    : ^ ^^ ^^ ^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var ra = foo<any[]>([1, 2]); // any[]
 >ra : any[]
@@ -83,10 +83,10 @@ var r4 = foo([1, '']); // {}[]
 >    : ^ ^^ ^^ ^^^^^^
 >[1, ''] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 var r5 = foo<any[]>([1, '']); // any[]
 >r5 : any[]
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
index 55b83a4e5cc..695867b12ba 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
@@ -25,8 +25,8 @@ var r = foo(1); // ok
 >       : ^^^^^^
 >foo : <T, U extends T>(t: T) => U
 >    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r2 = foo(null); // {}
 >r2 : any
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
index ea32adfa457..a73ea35f767 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
@@ -30,8 +30,8 @@ var r = foo(<U>(x: U) => ''); // {}
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >x : U
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r2 = foo<string>(<U>(x: U) => ''); // string 
 >r2 : string
@@ -44,8 +44,8 @@ var r2 = foo<string>(<U>(x: U) => ''); // string
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >x : U
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r3 = foo(x => ''); // {}
 >r3 : unknown
@@ -58,8 +58,8 @@ var r3 = foo(x => ''); // {}
 >        : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : unknown
 >  : ^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 function foo2<T, U>(x: T, cb: (a: T) => U) {
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
@@ -87,14 +87,14 @@ var r4 = foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signat
 >                                          : ^^^^^^
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^           ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >function <Z>(a: Z) { return '' } : <Z>(a: Z) => string
 >                                 : ^ ^^ ^^ ^^^^^^^^^^^
 >a : Z
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r5 = foo2(1, (a) => ''); // string
 >r5 : string
@@ -103,14 +103,14 @@ var r5 = foo2(1, (a) => ''); // string
 >                   : ^^^^^^
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^           ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(a) => '' : (a: number) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r6 = foo2<string, number>('', <Z>(a: Z) => 1);
 >r6 : number
@@ -119,14 +119,14 @@ var r6 = foo2<string, number>('', <Z>(a: Z) => 1);
 >                                         : ^^^^^^
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^           ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 ><Z>(a: Z) => 1 : <Z>(a: Z) => number
 >               : ^ ^^ ^^ ^^^^^^^^^^^
 >a : Z
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function foo3<T, U>(x: T, cb: (a: T) => U, y: U) {
 >foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
@@ -156,16 +156,16 @@ var r7 = foo3(1, <Z>(a: Z) => '', ''); // string
 >                             : ^^^^^^
 >foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^           ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 ><Z>(a: Z) => '' : <Z>(a: Z) => string
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >a : Z
 >  : ^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 var r8 = foo3(1, function (a) { return '' }, 1); // error
 >r8 : number
@@ -174,8 +174,8 @@ var r8 = foo3(1, function (a) { return '' }, 1); // error
 >                                       : ^
 >foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^           ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >function (a) { return '' } : (a: number) => string
 >                           : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
@@ -192,16 +192,16 @@ var r9 = foo3<number, string>(1, (a) => '', ''); // string
 >                                       : ^^^^^^
 >foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^           ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(a) => '' : (a: number) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 function other<T, U>(t: T, u: U) {
 >other : <T, U>(t: T, u: U) => void
@@ -224,8 +224,8 @@ function other<T, U>(t: T, u: U) {
 >             : ^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r10 = foo2(1, (x) => ''); // string
 >r10 : string
@@ -234,14 +234,14 @@ function other<T, U>(t: T, u: U) {
 >                   : ^^^^^^
 >foo2 : <T_1, U_1>(x: T_1, cb: (a: T_1) => U_1) => U_1
 >     : ^^^^^^^^^^^ ^^   ^^  ^^               ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x) => '' : (x: number) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r11 = foo3(1, (x: T) => '', ''); // error
 >r11 : string
@@ -256,10 +256,10 @@ function other<T, U>(t: T, u: U) {
 >             : ^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
     var r11b = foo3(1, (x: T) => '', 1); // error
 >r11b : string
@@ -274,10 +274,10 @@ function other<T, U>(t: T, u: U) {
 >             : ^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
     var r12 = foo3(1, function (a) { return '' }, 1); // error
 >r12 : number
@@ -286,8 +286,8 @@ function other<T, U>(t: T, u: U) {
 >                                       : ^
 >foo3 : <T_1, U_1>(x: T_1, cb: (a: T_1) => U_1, y: U_1) => U_1
 >     : ^^^^^^^^^^^ ^^   ^^  ^^               ^^ ^^   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >function (a) { return '' } : (a: number) => string
 >                           : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
index 6b973c25f39..05e4e0bd0dd 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
@@ -124,8 +124,8 @@ var r4b = foo2(1, a); // any
 >           : ^^^^^^
 >foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^               ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >a : new <T>(x: T) => T
 >  : ^^^^^ ^^ ^^ ^^^^^ 
 
@@ -136,8 +136,8 @@ var r5 = foo2(1, i); // any
 >           : ^^^^^^
 >foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^               ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >i : I
 >  : ^
 
@@ -148,8 +148,8 @@ var r6 = foo2<string, string>('', i2); // string
 >                             : ^^^^^^
 >foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^               ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >i2 : I2<string>
 >   : ^^^^^^^^^^
 
@@ -209,8 +209,8 @@ var r8 = foo3(1, i2, 1); // error
 >  : ^
 >i2 : I2<string>
 >   : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r9 = foo3<string, string>('', i2, ''); // string
 >r9 : string
@@ -219,10 +219,10 @@ var r9 = foo3<string, string>('', i2, ''); // string
 >                                 : ^^^^^^
 >foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
 >     : ^ ^^ ^^ ^^ ^^  ^^               ^^ ^^ ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >i2 : I2<string>
 >   : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
index bc9b81663c6..a5138804231 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
@@ -138,8 +138,8 @@ var r5 = foo({ cb: <T>(x: T) => '' }); // {}
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r6 = foo({ cb: (x: string) => '' }); // string
 >r6 : string
@@ -156,8 +156,8 @@ var r6 = foo({ cb: (x: string) => '' }); // string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r7 = foo({ cb: () => '' }); // string
 >r7 : string
@@ -172,6 +172,6 @@ var r7 = foo({ cb: () => '' }); // string
 >   : ^^^^^^^^^^^^
 >() => '' : () => string
 >         : ^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
index e6ee9d9dca2..0ca31964bac 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
@@ -39,14 +39,14 @@ var r1b = foo((x) => 1, (x) => ''); // {} => {}
 >         : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : unknown
 >  : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x) => '' : (x: unknown) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : unknown
 >  : ^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r2 = foo((x: Object) => null, (x: string) => ''); // Object => Object
 >r2 : (x: any) => any
@@ -95,14 +95,14 @@ var r3ii = foo((x: number) => 1, (x: number) => 1); // number => number
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: number) => 1 : (x: number) => number
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var a: { x: number; y?: number; };
 >a : { x: number; y?: number; }
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index a07c610757c..09fe11a5401 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -44,14 +44,14 @@ module onlyT {
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     function other2<T extends Date>(x: T) {
 >other2 : <T extends Date>(x: T) => void
@@ -285,14 +285,14 @@ module TU {
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     function other2<T extends Date>(x: T) {
 >other2 : <T extends Date>(x: T) => void
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
index 017cfde02d7..cb753a16d60 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
@@ -56,14 +56,14 @@ var r1ii = foo('', (x) => '', (x) => null); // string => string
 >                                : ^ ^^^^^^^^^^^^^^^^^^^
 >foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >    : ^ ^^ ^^ ^^ ^^           ^^ ^^           ^^^^^^ ^^ ^^^^^ 
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x) => '' : (x: string) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x) => null : (x: string) => any
 >            : ^ ^^^^^^^^^^^^^^^^
 >x : string
@@ -234,8 +234,8 @@ var r8 = foo2('', (x) => '', (x) => null); // string => string
 >                                 : ^ ^^^^^^^^^^^^^^^^
 >foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >     : ^ ^^ ^^ ^^ ^^ ^^           ^^ ^^           ^^^^^^ ^^ ^^^^^ 
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x) => '' : (x: string) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -258,14 +258,14 @@ var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 >          : ^ ^^^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x) => '' : (x: any) => string
 >          : ^ ^^^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >r10 : (x: Object) => string
@@ -278,14 +278,14 @@ var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : Object
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var x: (a: string) => boolean;
 >x : (a: string) => boolean
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
index 229de87be99..fc7a32d4661 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
@@ -27,12 +27,12 @@ var r = foo({ bar: 1, baz: '' }); // error
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >baz : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r2 = foo({ bar: 1, baz: 1 }); // T = number
 >r2 : { bar: number; baz: number; }
@@ -45,12 +45,12 @@ var r2 = foo({ bar: 1, baz: 1 }); // T = number
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >baz : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo
 >r3 : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types b/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types
index 1a22c033ade..14050295343 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types
@@ -27,14 +27,14 @@ var x = foo({ x: 3, y: "" }, 4);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
->4 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>4 : 4
+>  : ^
 
 var x2 = foo<number>({ x: 3, y: "" }, 4); 
 >x2 : number
@@ -47,14 +47,14 @@ var x2 = foo<number>({ x: 3, y: "" }, 4);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
->4 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>4 : 4
+>  : ^
 
 var x3 = foo<string>({ x: 3, y: "" }, 4); 
 >x3 : string
@@ -67,14 +67,14 @@ var x3 = foo<string>({ x: 3, y: "" }, 4);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
->4 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>4 : 4
+>  : ^
 
 var x4 = foo<number>({ x: "", y: 4 }, "");
 >x4 : number
@@ -87,14 +87,14 @@ var x4 = foo<number>({ x: "", y: 4 }, "");
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>4 : 4
+>  : ^
+>"" : ""
+>   : ^^
 
 var x5 = foo<string>({ x: "", y: 4 }, "");
 >x5 : string
@@ -107,12 +107,12 @@ var x5 = foo<string>({ x: "", y: 4 }, "");
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>4 : 4
+>  : ^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
index c538f10c1b8..b0cf1ce86ab 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
@@ -87,8 +87,8 @@ var r3 = foo(c, { x: '', foo: c });
 >                  : ^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >foo : C
 >    : ^
 >c : C
@@ -157,8 +157,8 @@ var r9 = foo(() => { }, () => 1);
 >          : ^^^^^^^^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function other<T, U extends T>() {
 >other : <T, U extends T>() => void
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
index dd0ef47a88b..6c82e41b5ff 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
@@ -71,8 +71,8 @@ var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no do
 >    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^  ^^ ^^^^^^ ^^ ^^^^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >() => { } : () => void
 >          : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index da9cb2d6ae5..0575cf67290 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -185,8 +185,8 @@ module GenericParameter {
 >           : ^^^^^^^ ^^^^^^^^^^^^      ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                                  ^^^^^^^^^^^^ ^^ ^^^      ^^^^^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 >  : ^^^^^^^ ^^ ^^ ^^^      ^^^^^^^ ^^ ^^      ^^^ ^^^
 
@@ -213,8 +213,8 @@ module GenericParameter {
 >           : ^^^^^^^ ^^^^^^^^^^^^      ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                                  ^^^^^^^^^^^^ ^^ ^^^      ^^^^^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : { <T>(x: number): T; new <T>(x: T): string; }
 >  : ^^^ ^^ ^^      ^^^ ^^^^^^^ ^^ ^^ ^^^      ^^^
 
@@ -225,8 +225,8 @@ module GenericParameter {
 >            : ^^^^^^^ ^^^^^^^^^^^^      ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                                  ^^^^^^^^^^^^ ^^ ^^^      ^^^^^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c2 : { new <T>(x: T): string; new <T>(x: number): T; }
 >   : ^^^^^^^ ^^ ^^ ^^^      ^^^^^^^ ^^ ^^      ^^^ ^^^
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
index 8720daf727c..64199177e33 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
@@ -147,8 +147,8 @@ module GenericParameter {
 >           : ^^^^^^^ ^^^^^^^^^^^^      ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                                  ^^^^^^^^^^^^ ^^ ^^^      ^^^^^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >a : new <T>(x: T) => T
 >  : ^^^^^ ^^ ^^ ^^^^^ 
 
@@ -167,8 +167,8 @@ module GenericParameter {
 >           : ^^^^^^^ ^^^^^^^^^^^^      ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                                  ^^^^^^^^^^^^ ^^ ^^^      ^^^^^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : { new <T>(x: T): number; new <T>(x: number): T; }
 >  : ^^^^^^^ ^^ ^^ ^^^      ^^^^^^^ ^^ ^^      ^^^ ^^^
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index b2702e5f5ca..896f081b5c8 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -219,8 +219,8 @@ module GenericParameter {
 >                         : ^^^ ^^^^^^^^^^^^      ^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                          ^^^^^^^^ ^^ ^^^      ^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 ><T>(x: T) => '' : <T>(x: T) => string
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >x : T
@@ -243,8 +243,8 @@ module GenericParameter {
 >           : ^^^ ^^^^^^^^^^^^      ^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                          ^^^^^^^^ ^^ ^^^      ^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >a : { <T>(x: T): string; <T>(x: number): T; }
 >  : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^      ^^^ ^^^
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
index 1a846662e4d..fd7a6cb4dec 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
@@ -114,8 +114,8 @@ module GenericParameter {
 >  : ^
 >y : T
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     function foo7<T>(x:T, cb: { (x: T): string; (x: T, y?: T): string }) {
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
@@ -143,8 +143,8 @@ module GenericParameter {
 >                        : ^^^ ^^^^^^^^^^^^      ^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                          ^^^^^^^^ ^^ ^^^      ^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 ><T>(x: T) => x : <T>(x: T) => T
 >               : ^ ^^ ^^ ^^^^^^
 >x : T
@@ -167,8 +167,8 @@ module GenericParameter {
 >           : ^^^ ^^^^^^^^^^^^      ^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^      ^^^
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >     : ^ ^^ ^^ ^^  ^^                                          ^^^^^^^^ ^^ ^^^      ^^^ ^^ ^^ ^^^ ^^^      ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >a : { <T>(x: T): number; <T>(x: number): T; }
 >  : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^      ^^^ ^^^
 }
diff --git a/tests/baselines/reference/genericCallWithTupleType.types b/tests/baselines/reference/genericCallWithTupleType.types
index a5d619dfcf6..94b6b2cda0d 100644
--- a/tests/baselines/reference/genericCallWithTupleType.types
+++ b/tests/baselines/reference/genericCallWithTupleType.types
@@ -27,10 +27,10 @@ i1.tuple1 = ["foo", 5];
 >       : ^^^^^^^^^^^^^^^^
 >["foo", 5] : [string, number]
 >           : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>5 : 5
+>  : ^
 
 var e1 = i1.tuple1[0];  // string
 >e1 : string
@@ -71,10 +71,10 @@ i1.tuple1 = ["foo", 5, false, true];
 >       : ^^^^^^^^^^^^^^^^
 >["foo", 5, false, true] : [string, number, boolean, boolean]
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>5 : 5
+>  : ^
 >false : false
 >      : ^^^^^
 >true : true
@@ -204,10 +204,10 @@ i1.tuple1 = [5, "foo"];
 >       : ^^^^^^^^^^^^^^^^
 >[5, "foo"] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>5 : 5
+>  : ^
+>"foo" : "foo"
+>      : ^^^^^
 
 i1.tuple1 = [{}, {}];
 >i1.tuple1 = [{}, {}] : [{}, {}]
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.types b/tests/baselines/reference/genericClassExpressionInFunction.types
index 43c62680dc9..b9c33e7e867 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.types
+++ b/tests/baselines/reference/genericClassExpressionInFunction.types
@@ -118,38 +118,38 @@ var s = new S();
 >  : ^^^^^^^^
 
 c.genericVar = 12;
->c.genericVar = 12 : number
->                  : ^^^^^^
+>c.genericVar = 12 : 12
+>                  : ^^
 >c.genericVar : number
 >             : ^^^^^^
 >c : C
 >  : ^
 >genericVar : number
 >           : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 k.genericVar = 12;
->k.genericVar = 12 : number
->                  : ^^^^^^
+>k.genericVar = 12 : 12
+>                  : ^^
 >k.genericVar : number
 >             : ^^^^^^
 >k : K
 >  : ^
 >genericVar : number
 >           : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 s.genericVar = 12;
->s.genericVar = 12 : number
->                  : ^^^^^^
+>s.genericVar = 12 : 12
+>                  : ^^
 >s.genericVar : number
 >             : ^^^^^^
 >s : S
 >  : ^
 >genericVar : number
 >           : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index d89bf24a75d..8df471267cb 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -183,8 +183,8 @@ module Portal.Controls.Validators {
 >          : ^     ^^      ^^^^^      
 >value : TValue
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 16f7fbfec47..0b5546dadc2 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -51,8 +51,8 @@ module ImmediatelyFix {
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >x : U
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r2 = c.foo<string>(<U>(x: U) => ''); // string 
 >r2 : string
@@ -69,8 +69,8 @@ module ImmediatelyFix {
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >x : U
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r3 = c.foo(x => ''); // {}
 >r3 : unknown
@@ -87,8 +87,8 @@ module ImmediatelyFix {
 >        : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : unknown
 >  : ^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     class C2<T> {
 >C2 : C2<T>
@@ -133,8 +133,8 @@ module ImmediatelyFix {
 >               : ^ ^^ ^^ ^^^^^^^^^^^
 >x : U
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     var r3a = c2.foo(x => 1); // number
 >r3a : number
@@ -151,8 +151,8 @@ module ImmediatelyFix {
 >       : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 module WithCandidates {
@@ -198,14 +198,14 @@ module WithCandidates {
 >  : ^^^^^^^^^
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >     : ^ ^^ ^^ ^^^^^  ^^^ ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >function <Z>(a: Z) { return '' } : <Z>(a: Z) => string
 >                                 : ^ ^^ ^^ ^^^^^^^^^^^
 >a : Z
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r5 = c.foo2(1, (a) => ''); // string
 >r5 : string
@@ -218,14 +218,14 @@ module WithCandidates {
 >  : ^^^^^^^^^
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >     : ^ ^^ ^^ ^^^^^  ^^^ ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(a) => '' : (a: number) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r6 = c.foo2<string, number>('', <Z>(a: Z) => 1); // number
 >r6 : number
@@ -238,14 +238,14 @@ module WithCandidates {
 >  : ^^^^^^^^^
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >     : ^ ^^ ^^ ^^^^^  ^^^ ^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 ><Z>(a: Z) => 1 : <Z>(a: Z) => number
 >               : ^ ^^ ^^ ^^^^^^^^^^^
 >a : Z
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     class C2<T, U> {
 >C2 : C2<T, U>
@@ -288,16 +288,16 @@ module WithCandidates {
 >   : ^^^^^^^^^^^^^^^^^^
 >foo3 : (x: number, cb: (a: number) => string, y: string) => string
 >     : ^ ^^^^^^^^^^  ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 ><Z>(a: Z) => '' : <Z>(a: Z) => string
 >                : ^ ^^ ^^ ^^^^^^^^^^^
 >a : Z
 >  : ^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
     var r8 = c2.foo3(1, function (a) { return '' }, ''); // string
 >r8 : string
@@ -310,16 +310,16 @@ module WithCandidates {
 >   : ^^^^^^^^^^^^^^^^^^
 >foo3 : (x: number, cb: (a: number) => string, y: string) => string
 >     : ^ ^^^^^^^^^^  ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >function (a) { return '' } : (a: number) => string
 >                           : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
     class C3<T, U> {
 >C3 : C3<T, U>
@@ -375,8 +375,8 @@ module WithCandidates {
 >             : ^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         var r10 = c.foo2(1, (x) => ''); // string
 >r10 : string
@@ -389,14 +389,14 @@ module WithCandidates {
 >  : ^^^^^^^^^
 >foo2 : <T_1, U_1>(x: T_1, cb: (a: T_1) => U_1) => U_1
 >     : ^^^^^^^^^^^ ^^^^^^^  ^^^ ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x) => '' : (x: number) => string
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         var r11 = c3.foo3(1, (x: T) => '', ''); // error
 >r11 : string
@@ -415,10 +415,10 @@ module WithCandidates {
 >             : ^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
         var r11b = c3.foo3(1, (x: T) => '', 1); // error
 >r11b : string
@@ -437,10 +437,10 @@ module WithCandidates {
 >             : ^ ^^ ^^^^^^^^^^^
 >x : T
 >  : ^
->'' : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>1 : 1
+>  : ^
 
         var r12 = c3.foo3(1, function (a) { return '' }, 1); // error
 >r12 : number
@@ -453,8 +453,8 @@ module WithCandidates {
 >   : ^^^^^^^^^^^^^^^^^^
 >foo3 : <T_1, U_1>(x: T_1, cb: (a: T_1) => U_1, y: U_1) => U_1
 >     : ^^^^^^^^^^^ ^^^^^^^  ^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >function (a) { return '' } : (a: number) => string
 >                           : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.types b/tests/baselines/reference/genericClassWithStaticFactory.types
index 71fc110aa2f..9267d7f88a1 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.types
+++ b/tests/baselines/reference/genericClassWithStaticFactory.types
@@ -153,12 +153,12 @@ module Editor {
 >     : ^^^^^^^
 
             for (i = 0; !(entry.isHead); i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >!(entry.isHead) : boolean
 >                : ^^^^^^^
 >(entry.isHead) : boolean
diff --git a/tests/baselines/reference/genericConstraint1.types b/tests/baselines/reference/genericConstraint1.types
index 9238d7ebee8..3d8416f5bba 100644
--- a/tests/baselines/reference/genericConstraint1.types
+++ b/tests/baselines/reference/genericConstraint1.types
@@ -34,8 +34,8 @@ x.bar2<string>(2, "");
 >  : ^^^^^^^^^
 >bar2 : <U extends number>(x: number, y: U) => number
 >     : ^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>2 : 2
+>  : ^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/genericConstraint2.types b/tests/baselines/reference/genericConstraint2.types
index 3e1b3f4f624..bd40e827183 100644
--- a/tests/baselines/reference/genericConstraint2.types
+++ b/tests/baselines/reference/genericConstraint2.types
@@ -22,14 +22,14 @@ function compare<T extends Comparable<T>>(x: T, y: T): number {
 >          : ^^^^^^^
 >x : T
 >  : ^
->y == null ? 0 : -1 : number
+>y == null ? 0 : -1 : 0 | -1
 >                   : ^^^^^^
 >y == null : boolean
 >          : ^^^^^^^
 >y : T
 >  : ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >-1 : -1
 >   : ^^
 >1 : 1
@@ -40,8 +40,8 @@ function compare<T extends Comparable<T>>(x: T, y: T): number {
 >          : ^^^^^^^
 >y : T
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     return x.comparer(y);
 >x.comparer(y) : number
@@ -83,8 +83,8 @@ var a = new ComparableString("a");
 >                          : ^^^^^^^^^^^^^^^^
 >ComparableString : typeof ComparableString
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 var b = new ComparableString("b");
 >b : ComparableString
@@ -93,8 +93,8 @@ var b = new ComparableString("b");
 >                          : ^^^^^^^^^^^^^^^^
 >ComparableString : typeof ComparableString
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 var c = compare<ComparableString>(a, b);
 >c : number
diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.types b/tests/baselines/reference/genericConstraintSatisfaction1.types
index db624bfe7e9..55c74f9f64f 100644
--- a/tests/baselines/reference/genericConstraintSatisfaction1.types
+++ b/tests/baselines/reference/genericConstraintSatisfaction1.types
@@ -28,6 +28,6 @@ x.f({s: 1})
 >       : ^^^^^^^^^^^^^^
 >s : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericConstructSignatureInInterface.types b/tests/baselines/reference/genericConstructSignatureInInterface.types
index 414fe36a731..0885ab28f00 100644
--- a/tests/baselines/reference/genericConstructSignatureInInterface.types
+++ b/tests/baselines/reference/genericConstructSignatureInInterface.types
@@ -16,6 +16,6 @@ var r = new v<number>(1);
 >new v<number>(1) : any
 >v : C
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericContextualTypes2.types b/tests/baselines/reference/genericContextualTypes2.types
index eaa7c907699..5a0a15b751d 100644
--- a/tests/baselines/reference/genericContextualTypes2.types
+++ b/tests/baselines/reference/genericContextualTypes2.types
@@ -96,8 +96,8 @@ createMachine<{ count: number }>({
     count: 0,
 >count : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   },
   entry: assign({
diff --git a/tests/baselines/reference/genericContextualTypes3.types b/tests/baselines/reference/genericContextualTypes3.types
index dff26209cee..4b7a6177b5b 100644
--- a/tests/baselines/reference/genericContextualTypes3.types
+++ b/tests/baselines/reference/genericContextualTypes3.types
@@ -94,8 +94,8 @@ createMachine<{ count: number }>({
     count: 0,
 >count : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   },
   entry: assign({
diff --git a/tests/baselines/reference/genericContextualTypingSpecialization.types b/tests/baselines/reference/genericContextualTypingSpecialization.types
index 5267e91c68f..63784a2e7d3 100644
--- a/tests/baselines/reference/genericContextualTypingSpecialization.types
+++ b/tests/baselines/reference/genericContextualTypingSpecialization.types
@@ -26,6 +26,6 @@ b.reduce<number>((c, d) => c + d, 0); // should not error on '+'
 >  : ^^^^^^
 >d : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/genericDefaults.types b/tests/baselines/reference/genericDefaults.types
index a1e285d9165..b4c1c435c1d 100644
--- a/tests/baselines/reference/genericDefaults.types
+++ b/tests/baselines/reference/genericDefaults.types
@@ -2912,8 +2912,8 @@ const Base01c01 = new Base01(1);
 >              : ^^^^^^^^^^^^^^
 >Base01 : Base01Constructor
 >       : ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const Base01c02 = new Base01<number>();
 >Base01c02 : Base01<number>
@@ -2930,8 +2930,8 @@ const Base01c03 = new Base01<number>(1);
 >                      : ^^^^^^^^^^^^^^
 >Base01 : Base01Constructor
 >       : ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 declare class Derived01<T> extends Base01<T> { }
 >Derived01 : Derived01<T>
@@ -2954,8 +2954,8 @@ const Derived01c01 = new Derived01(1);
 >                 : ^^^^^^^^^^^^^^^^^
 >Derived01 : typeof Derived01
 >          : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const Derived01c02 = new Derived01<number>();
 >Derived01c02 : Derived01<number>
@@ -2972,8 +2972,8 @@ const Derived01c03 = new Derived01<number>(1);
 >                         : ^^^^^^^^^^^^^^^^^
 >Derived01 : typeof Derived01
 >          : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 declare class Derived02<T = string> extends Base01<T> { }
 >Derived02 : Derived02<T>
@@ -2996,8 +2996,8 @@ const Derived02c01 = new Derived02(1);
 >                 : ^^^^^^^^^^^^^^^^^
 >Derived02 : typeof Derived02
 >          : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const Derived02c02 = new Derived02<number>();
 >Derived02c02 : Derived02<number>
@@ -3014,8 +3014,8 @@ const Derived02c03 = new Derived02<number>(1);
 >                         : ^^^^^^^^^^^^^^^^^
 >Derived02 : typeof Derived02
 >          : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // https://github.com/Microsoft/TypeScript/issues/16211
 interface Base02 {}
diff --git a/tests/baselines/reference/genericDefaultsJs.types b/tests/baselines/reference/genericDefaultsJs.types
index 87281420d3c..22e1b538267 100644
--- a/tests/baselines/reference/genericDefaultsJs.types
+++ b/tests/baselines/reference/genericDefaultsJs.types
@@ -69,8 +69,8 @@ const f1_c1 = f1(1);
 >      : ^^^^^^^^^^^^^^^^
 >f1 : <T, U = number>(x?: T) => [T, U]
 >   : ^ ^^ ^^^^^^^^^^^ ^^^ ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const C0_v0 = new C0();
 >C0_v0 : C0<any>
@@ -95,8 +95,8 @@ const C0_v1 = new C0(1);
 >          : ^^^^^^^^^^
 >C0 : typeof C0
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const C0_v1_y = C0_v1.y;
 >C0_v1_y : number
@@ -133,8 +133,8 @@ const C1_v1 = new C1(1);
 >          : ^^^^^^^^^^^^^^^^^^
 >C1 : typeof C1
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const C1_v1_y = C1_v1.y;
 >C1_v1_y : [number, number]
diff --git a/tests/baselines/reference/genericFunctionInference1.types b/tests/baselines/reference/genericFunctionInference1.types
index 6b4042eba1a..e973ef58a7d 100644
--- a/tests/baselines/reference/genericFunctionInference1.types
+++ b/tests/baselines/reference/genericFunctionInference1.types
@@ -922,10 +922,10 @@ const p1 = new Point(10, 20);
 >                  : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 const p2 = newPoint(10, 20);
 >p2 : Point
@@ -934,10 +934,10 @@ const p2 = newPoint(10, 20);
 >                 : ^^^^^
 >newPoint : (x: number, y: number) => Point
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 const bag1 = new Bag(1, 2, 3);
 >bag1 : Bag<number>
@@ -946,12 +946,12 @@ const bag1 = new Bag(1, 2, 3);
 >                 : ^^^^^^^^^^^
 >Bag : typeof Bag
 >    : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 const bag2 = newBag('a', 'b', 'c');
 >bag2 : Bag<string>
@@ -960,12 +960,12 @@ const bag2 = newBag('a', 'b', 'c');
 >                      : ^^^^^^^^^^^
 >newBag : <T>(...args: T[]) => Bag<T>
 >       : ^ ^^^^^    ^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
->'c' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
+>'c' : "c"
+>    : ^^^
 
 declare class Comp<P> {
 >Comp : Comp<P>
@@ -1244,8 +1244,8 @@ const arr: string[] = map(identityStr)(['a']);
 >            : ^ ^^      ^^^^^^^^^^^
 >['a'] : string[]
 >      : ^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 const arr1: string[] = map(identity)(['a']);
 >arr1 : string[]
@@ -1260,8 +1260,8 @@ const arr1: string[] = map(identity)(['a']);
 >         : ^ ^^     ^^ ^^^^^ 
 >['a'] : string[]
 >      : ^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 // #9949
 
@@ -1359,8 +1359,8 @@ const fn20 = pipe((_a?: {}) => 1);
 >               : ^  ^^^  ^^^^^^^^^^^
 >_a : {} | undefined
 >   : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // #29904.3
 
@@ -1415,8 +1415,8 @@ const promise = Promise.resolve(1);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 promise.then(
 >promise.then(    pipe(        x => x + 1,        x => x * 2,    ),) : Promise<number>
@@ -1638,8 +1638,8 @@ foo2(identity, 1);
 >     : ^ ^^ ^^^^^^  ^^ ^^ ^^^ ^^ ^^^ ^^^^^      
 >identity : <T>(value: T) => T
 >         : ^ ^^     ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Repro from #30324
 
@@ -1664,6 +1664,6 @@ const a2 = times(identity)(5); // => [0, 1, 2, 3, 4]
 >      : ^ ^^  ^^                ^^^^^                  
 >identity : <T>(value: T) => T
 >         : ^ ^^     ^^ ^^^^^ 
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types b/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types
index f6ea3334597..060368f72b6 100644
--- a/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types
+++ b/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types
@@ -28,6 +28,6 @@ map((a) => a.length, [1]);
 >       : ^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericFunctions0.types b/tests/baselines/reference/genericFunctions0.types
index b747dfac9a2..650dc5c083a 100644
--- a/tests/baselines/reference/genericFunctions0.types
+++ b/tests/baselines/reference/genericFunctions0.types
@@ -16,6 +16,6 @@ var x = foo<number>(5); // 'x' should be number
 >               : ^^^^^^
 >foo : <T>(x: T) => T
 >    : ^ ^^ ^^ ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/genericFunctionsAndConditionalInference.types b/tests/baselines/reference/genericFunctionsAndConditionalInference.types
index d73401c6cc1..057667bb7c6 100644
--- a/tests/baselines/reference/genericFunctionsAndConditionalInference.types
+++ b/tests/baselines/reference/genericFunctionsAndConditionalInference.types
@@ -51,16 +51,16 @@ let qq = foo({ u: { value: 10 }, v: { value: 'hello'} });  // { u: U, v: V } but
 >              : ^^^^^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >v : { value: string; }
 >  : ^^^^^^^^^^^^^^^^^^
 >{ value: 'hello'} : { value: string; }
 >                  : ^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 // From #42385
 interface Targets<A> {
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
index 0a0e8f60b4e..1f5280e89a7 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
@@ -69,8 +69,8 @@ var r3 = utils.mapReduce(c, (x) => { return 1 }, (y) => { return new Date() });
 >                    : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(y) => { return new Date() } : (y: number) => Date
 >                             : ^ ^^^^^^^^^^^^^^^^^
 >y : number
@@ -97,8 +97,8 @@ var r4 = utils.mapReduce(c, (x: string) => { return 1 }, (y: number) => { return
 >                            : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(y: number) => { return new Date() } : (y: number) => Date
 >                                     : ^ ^^      ^^^^^^^^^
 >y : number
diff --git a/tests/baselines/reference/genericIndexedAccessVarianceComparisonResultCorrect.types b/tests/baselines/reference/genericIndexedAccessVarianceComparisonResultCorrect.types
index 3495965c21e..036eb05faca 100644
--- a/tests/baselines/reference/genericIndexedAccessVarianceComparisonResultCorrect.types
+++ b/tests/baselines/reference/genericIndexedAccessVarianceComparisonResultCorrect.types
@@ -8,14 +8,14 @@ class A {
     x: string = 'A';
 >x : string
 >  : ^^^^^^
->'A' : string
->    : ^^^^^^
+>'A' : "A"
+>    : ^^^
 
     y: number = 0;
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class B {
@@ -25,8 +25,8 @@ class B {
     x: string = 'B';
 >x : string
 >  : ^^^^^^
->'B' : string
->    : ^^^^^^
+>'B' : "B"
+>    : ^^^
 
     z: boolean = true;
 >z : boolean
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index f3572797ab2..58986441db6 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -46,8 +46,8 @@
 >   : ^^^^^^^^^
 >observable : <T>(value: T) => ko.Observable<T>
 >           : ^ ^^     ^^ ^^^^^^^^^^^^^^^^^^   
->"Bob" : string
->      : ^^^^^^
+>"Bob" : "Bob"
+>      : ^^^^^
 
        age: ko.observable(37) 
 >age : ko.Observable<number>
@@ -60,8 +60,8 @@
 >   : ^^^^^^^^^
 >observable : <T>(value: T) => ko.Observable<T>
 >           : ^ ^^     ^^ ^^^^^^^^^^^^^^^^^^   
->37 : number
->   : ^^^^^^
+>37 : 37
+>   : ^^
 
     }; 
     var x_v = o.name().length;  // should be 'number'
@@ -101,8 +101,8 @@
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : ko.Observable<string>
 >     : ^^^^^^^^^^^^^^^^^^^^^
->"Robert" : string
->         : ^^^^^^
+>"Robert" : "Robert"
+>         : ^^^^^^^^
 
     var zz_v = o.name.N;  // should be 'number'
 >zz_v : number
diff --git a/tests/baselines/reference/genericMappedTypeAsClause.types b/tests/baselines/reference/genericMappedTypeAsClause.types
index 25dc01c3f2b..f9146c27f60 100644
--- a/tests/baselines/reference/genericMappedTypeAsClause.types
+++ b/tests/baselines/reference/genericMappedTypeAsClause.types
@@ -29,12 +29,12 @@ const foo1: MappedModel<'Foo'> = { aFoo: 'test', bFoo: 42 };
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >aFoo : string
 >     : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 >bFoo : number
 >     : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 const foo2: MappedModel<'Foo'> = { bFoo: 'bar' };  // Error
 >foo2 : MappedModel<"Foo">
@@ -43,8 +43,8 @@ const foo2: MappedModel<'Foo'> = { bFoo: 'bar' };  // Error
 >                : ^^^^^^^^^^^^^^^^^
 >bFoo : string
 >     : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 function f1<T extends string>() {
 >f1 : <T extends string>() => void
diff --git a/tests/baselines/reference/genericNewInterface.types b/tests/baselines/reference/genericNewInterface.types
index 704b3f0a857..854f51757dd 100644
--- a/tests/baselines/reference/genericNewInterface.types
+++ b/tests/baselines/reference/genericNewInterface.types
@@ -14,8 +14,8 @@ function createInstance<T>(ctor: new (s: string) => T): T {
 >             : ^
 >ctor : new (s: string) => T
 >     : ^^^^^ ^^      ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
                    
 interface INewable<T> {
@@ -35,6 +35,6 @@ function createInstance2<T>(ctor: INewable<T>): T {
 >               : ^
 >ctor : INewable<T>
 >     : ^^^^^^^^^^^
->1024 : number
->     : ^^^^^^
+>1024 : 1024
+>     : ^^^^
 }
diff --git a/tests/baselines/reference/genericObjectLitReturnType.types b/tests/baselines/reference/genericObjectLitReturnType.types
index bf8baa42500..8babd1cec37 100644
--- a/tests/baselines/reference/genericObjectLitReturnType.types
+++ b/tests/baselines/reference/genericObjectLitReturnType.types
@@ -34,19 +34,19 @@ var t1 = x.f(5);
 >  : ^^^^^^^^^
 >f : (t: number) => { a: number; }
 >  : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 t1.a = 5; // Should not error: t1 should have type {a: number}, instead has type {a: T}
->t1.a = 5 : number
->         : ^^^^^^
+>t1.a = 5 : 5
+>         : ^
 >t1.a : number
 >     : ^^^^^^
 >t1 : { a: number; }
 >   : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
  
 
diff --git a/tests/baselines/reference/genericReduce.types b/tests/baselines/reference/genericReduce.types
index 88f50b7db46..147a70473d2 100644
--- a/tests/baselines/reference/genericReduce.types
+++ b/tests/baselines/reference/genericReduce.types
@@ -106,8 +106,8 @@ n1.toExponential(2); // should not error if 'n1' is correctly number.
 >   : ^^^^^^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 n2.x = "fail";       // should error, as 'n2' should be type 'number', not 'any'.
 >n2.x = "fail" : "fail"
@@ -130,8 +130,8 @@ n2.toExponential(2); // should not error if 'n2' is correctly number.
 >   : ^^^^^^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var n3 = b.reduce<string>( (x, y) => x + y, ""); // Initial value is of type string
 >n3 : string
@@ -156,8 +156,8 @@ var n3 = b.reduce<string>( (x, y) => x + y, ""); // Initial value is of type str
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 n3.toExponential(2); // should error if 'n3' is correctly type 'string'
 >n3.toExponential(2) : any
@@ -180,6 +180,6 @@ n3.charAt(0);        // should not error if 'n3' is correctly type 'string'
 >   : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/genericRestArgs.types b/tests/baselines/reference/genericRestArgs.types
index a4e8bf8c74c..297a59b88ad 100644
--- a/tests/baselines/reference/genericRestArgs.types
+++ b/tests/baselines/reference/genericRestArgs.types
@@ -16,10 +16,10 @@ var a1Ga = makeArrayG(1, ""); // no error
 >                  : ^^^^^^^^
 >makeArrayG : <T>(...items: T[]) => T[]
 >           : ^ ^^^^^     ^^   ^^^^^   
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 
 var a1Gb = makeArrayG<any>(1, ""); 
 >a1Gb : any[]
@@ -52,10 +52,10 @@ var a1Gd = makeArrayG<number>(1, ""); // error
 >                          : ^^^^^^^^
 >makeArrayG : <T>(...items: T[]) => T[]
 >           : ^ ^^^^^     ^^   ^^^^^   
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 
 function makeArrayGOpt<T>(item1?: T, item2?: T, item3?: T) {
 >makeArrayGOpt : <T>(item1?: T, item2?: T, item3?: T) => T[]
@@ -84,10 +84,10 @@ var a2Ga = makeArrayGOpt(1, "");
 >                     : ^^^^^^^^
 >makeArrayGOpt : <T>(item1?: T, item2?: T, item3?: T) => T[]
 >              : ^ ^^     ^^^ ^^     ^^^ ^^     ^^^ ^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 
 var a2Gb = makeArrayG<any>(1, "");
 >a2Gb : any[]
diff --git a/tests/baselines/reference/genericRestArity.types b/tests/baselines/reference/genericRestArity.types
index ec8525db8da..0334641fc06 100644
--- a/tests/baselines/reference/genericRestArity.types
+++ b/tests/baselines/reference/genericRestArity.types
@@ -52,18 +52,18 @@ call((x: number, y: number) => x + y, 1, 2, 3, 4, 5, 6, 7);
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
->7 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
+>7 : 7
+>  : ^
 
diff --git a/tests/baselines/reference/genericRestArityStrict.types b/tests/baselines/reference/genericRestArityStrict.types
index 8492b509dd7..d41d78a17e6 100644
--- a/tests/baselines/reference/genericRestArityStrict.types
+++ b/tests/baselines/reference/genericRestArityStrict.types
@@ -52,18 +52,18 @@ call((x: number, y: number) => x + y, 1, 2, 3, 4, 5, 6, 7);
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
->7 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
+>7 : 7
+>  : ^
 
diff --git a/tests/baselines/reference/genericRestParameters1.types b/tests/baselines/reference/genericRestParameters1.types
index 1f09e79a0bc..12a2957921f 100644
--- a/tests/baselines/reference/genericRestParameters1.types
+++ b/tests/baselines/reference/genericRestParameters1.types
@@ -62,10 +62,10 @@ f1(42, "hello", true);
 >                      : ^^^^
 >f1 : (x_0: number, x_1: string, x_2: boolean) => void
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -108,8 +108,8 @@ f1(42, ...t2);
 >              : ^^^^
 >f1 : (x_0: number, x_1: string, x_2: boolean) => void
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, boolean]
@@ -120,10 +120,10 @@ f1(42, "hello", ...t1);
 >                       : ^^^^
 >f1 : (x_0: number, x_1: string, x_2: boolean) => void
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t1 : boolean
 >      : ^^^^^^^
 >t1 : [boolean]
@@ -134,10 +134,10 @@ f1(42, "hello", true, ...t0);
 >                             : ^^^^
 >f1 : (x_0: number, x_1: string, x_2: boolean) => void
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t0 : never
@@ -182,10 +182,10 @@ f2(42, "hello", true);
 >                      : ^^^^
 >f2 : (x0: number, x1: string, x2: boolean) => void
 >   : ^  ^^      ^^  ^^      ^^  ^^       ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -228,8 +228,8 @@ f2(42, ...t2);
 >              : ^^^^
 >f2 : (x0: number, x1: string, x2: boolean) => void
 >   : ^  ^^      ^^  ^^      ^^  ^^       ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, boolean]
@@ -240,10 +240,10 @@ f2(42, "hello", ...t1);
 >                       : ^^^^
 >f2 : (x0: number, x1: string, x2: boolean) => void
 >   : ^  ^^      ^^  ^^      ^^  ^^       ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t1 : boolean
 >      : ^^^^^^^
 >t1 : [boolean]
@@ -254,10 +254,10 @@ f2(42, "hello", true, ...t0);
 >                             : ^^^^
 >f2 : (x0: number, x1: string, x2: boolean) => void
 >   : ^  ^^      ^^  ^^      ^^  ^^       ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t0 : never
@@ -310,10 +310,10 @@ const x10 = f10(42, "hello", true);  // [number, string, boolean]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -324,10 +324,10 @@ const x11 = f10(42, "hello");  // [number, string]
 >                 : ^^^^^^^^^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 const x12 = f10(42);  // [number]
 >x12 : [number]
@@ -336,8 +336,8 @@ const x12 = f10(42);  // [number]
 >        : ^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 const x13 = f10();  // []
 >x13 : []
@@ -366,8 +366,8 @@ const x15 = f10(42, ...t2);  // [number, string, boolean]
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, boolean]
@@ -380,10 +380,10 @@ const x16 = f10(42, "hello", ...t1);  // [number, string, boolean]
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t1 : boolean
 >      : ^^^^^^^
 >t1 : [boolean]
@@ -396,10 +396,10 @@ const x17 = f10(42, "hello", true, ...t0);  // [number, string, boolean]
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t0 : never
@@ -460,8 +460,8 @@ function g10<U extends string[], V extends [number, number]>(u: U, v: V) {
 >             : ^^^^^^^^^^^^^^
 >f10 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...u : string
 >     : ^^^^^^
 >u : U
@@ -748,10 +748,10 @@ let x20 = call((x, y) => x + y, 10, 20);  // number
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let x21 = call((x, y) => x + y, 10, "hello");  // string
 >x21 : string
@@ -772,10 +772,10 @@ let x21 = call((x, y) => x + y, 10, "hello");  // string
 >  : ^^^^^^
 >y : string
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let x22 = call(f15, "hello", 42);  // string | number
 >x22 : string | number
@@ -786,10 +786,10 @@ let x22 = call(f15, "hello", 42);  // string | number
 >     : ^ ^^^^^^^^^         ^^ ^^ ^^                 ^^^^^    ^^ ^^^^^^
 >f15 : (a: string, b: number) => string | number
 >    : ^ ^^      ^^ ^^      ^^^^^               
->"hello" : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 let x23 = call(f16, "hello", 42);  // unknown
 >x23 : string | number
@@ -800,10 +800,10 @@ let x23 = call(f16, "hello", 42);  // unknown
 >     : ^ ^^^^^^^^^         ^^ ^^ ^^                 ^^^^^    ^^ ^^^^^^
 >f16 : <A, B>(a: A, b: B) => A | B
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^     
->"hello" : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 let x24 = call<[string, number], string | number>(f16, "hello", 42);  // string | number
 >x24 : string | number
@@ -814,10 +814,10 @@ let x24 = call<[string, number], string | number>(f16, "hello", 42);  // string
 >     : ^ ^^^^^^^^^         ^^ ^^ ^^                 ^^^^^    ^^ ^^^^^^
 >f16 : <A, B>(a: A, b: B) => A | B
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^     
->"hello" : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 let x30 = callr(sn, (x, y) => x + y);  // string
 >x30 : string
@@ -945,10 +945,10 @@ f20(42, "hello", true);
 >                       : ^^^^^^^^
 >f20 : (x: number, y: string, z: boolean) => string[]
 >    : ^ ^^      ^^ ^^      ^^ ^^       ^^^^^        
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -957,8 +957,8 @@ f21("hello", true);
 >                   : ^^^^^^^^
 >f21 : (y: string, z: boolean) => string[]
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -1027,10 +1027,10 @@ g20(42, "hello", true);
 >                       : ^^^^^^^^
 >g20 : (x: number, y?: string, z?: boolean) => string[]
 >    : ^ ^^      ^^ ^^^      ^^ ^^^       ^^^^^        
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -1039,26 +1039,26 @@ g20(42, "hello");
 >                 : ^^^^^^^^
 >g20 : (x: number, y?: string, z?: boolean) => string[]
 >    : ^ ^^      ^^ ^^^      ^^ ^^^       ^^^^^        
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 g20(42);
 >g20(42) : string[]
 >        : ^^^^^^^^
 >g20 : (x: number, y?: string, z?: boolean) => string[]
 >    : ^ ^^      ^^ ^^^      ^^ ^^^       ^^^^^        
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 g21("hello", true);
 >g21("hello", true) : string[]
 >                   : ^^^^^^^^
 >g21 : (y?: string | undefined, z?: boolean | undefined) => string[]
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -1067,8 +1067,8 @@ g21("hello");
 >             : ^^^^^^^^
 >g21 : (y?: string | undefined, z?: boolean | undefined) => string[]
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 g21();
 >g21() : string[]
@@ -1113,8 +1113,8 @@ const c30 = f30(42, x => "" + x, x => x + 1);  // [(x: number) => string, (x: nu
 >                                 : ^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
 >f30 : <T, U extends ((x: T) => any)[]>(x: T, ...args: U) => U
 >    : ^ ^^ ^^^^^^^^^                 ^^ ^^ ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >x => "" + x : (x: number) => string
 >            : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -1245,8 +1245,8 @@ events.emit('move', 10, 'left');
 >     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >'move' : "move"
 >       : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >'left' : "left"
 >       : ^^^^^^
 
@@ -1261,8 +1261,8 @@ events.emit('jump', 20, 'up');
 >     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >'jump' : "jump"
 >       : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 >'up' : "up"
 >     : ^^^^
 
@@ -1277,7 +1277,7 @@ events.emit('stop', 'Bye!');
 >     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >'stop' : "stop"
 >       : ^^^^^^
->'Bye!' : string
+>'Bye!' : "Bye!"
 >       : ^^^^^^
 
 events.emit('done');
diff --git a/tests/baselines/reference/genericRestParameters2.types b/tests/baselines/reference/genericRestParameters2.types
index dbf2fc535a4..35697d2c52c 100644
--- a/tests/baselines/reference/genericRestParameters2.types
+++ b/tests/baselines/reference/genericRestParameters2.types
@@ -110,20 +110,20 @@ f10(42, "hello");
 >                 : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f10(42, "hello", true);
 >f10(42, "hello", true) : void
 >                       : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -132,10 +132,10 @@ f10(42, "hello", true, false);
 >                              : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >false : false
@@ -186,8 +186,8 @@ f10(42, ...t2);
 >               : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, ...boolean[]]
@@ -198,10 +198,10 @@ f10(42, "hello", ...t3);
 >                        : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t3 : boolean
 >      : ^^^^^^^
 >t3 : boolean[]
@@ -212,10 +212,10 @@ f10(42, "hello", true, ...t4);
 >                              : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -228,10 +228,10 @@ f10(42, "hello", true, ...t4, false, ...t3);
 >                                            : ^^^^
 >f10 : (x_0: number, x_1: string, ...x_2: boolean[]) => void
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -250,20 +250,20 @@ f11(42, "hello");
 >                 : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f11(42, "hello", true);
 >f11(42, "hello", true) : void
 >                       : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -272,10 +272,10 @@ f11(42, "hello", true, false);
 >                              : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >false : false
@@ -326,8 +326,8 @@ f11(42, ...t2);
 >               : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, ...boolean[]]
@@ -338,10 +338,10 @@ f11(42, "hello", ...t3);
 >                        : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t3 : boolean
 >      : ^^^^^^^
 >t3 : boolean[]
@@ -352,10 +352,10 @@ f11(42, "hello", true, ...t4);
 >                              : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -368,10 +368,10 @@ f11(42, "hello", true, ...t4, false, ...t3);
 >                                            : ^^^^
 >f11 : (a: number, x_0: string, ...x_1: boolean[]) => void
 >    : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -390,20 +390,20 @@ f12(42, "hello");
 >                 : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f12(42, "hello", true);
 >f12(42, "hello", true) : void
 >                       : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -412,10 +412,10 @@ f12(42, "hello", true, false);
 >                              : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >false : false
@@ -466,8 +466,8 @@ f12(42, ...t2);
 >               : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, ...boolean[]]
@@ -478,10 +478,10 @@ f12(42, "hello", ...t3);
 >                        : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t3 : boolean
 >      : ^^^^^^^
 >t3 : boolean[]
@@ -492,10 +492,10 @@ f12(42, "hello", true, ...t4);
 >                              : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -508,10 +508,10 @@ f12(42, "hello", true, ...t4, false, ...t3);
 >                                            : ^^^^
 >f12 : (a: number, b: string, ...x: [...boolean[]]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^              ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -530,20 +530,20 @@ f13(42, "hello");
 >                 : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 f13(42, "hello", true);
 >f13(42, "hello", true) : void
 >                       : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -552,10 +552,10 @@ f13(42, "hello", true, false);
 >                              : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >false : false
@@ -606,8 +606,8 @@ f13(42, ...t2);
 >               : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, ...boolean[]]
@@ -618,10 +618,10 @@ f13(42, "hello", ...t3);
 >                        : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t3 : boolean
 >      : ^^^^^^^
 >t3 : boolean[]
@@ -632,10 +632,10 @@ f13(42, "hello", true, ...t4);
 >                              : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -648,10 +648,10 @@ f13(42, "hello", true, ...t4, false, ...t3);
 >                                            : ^^^^
 >f13 : (a: number, b: string, ...c: boolean[]) => void
 >    : ^ ^^      ^^ ^^      ^^^^^ ^^         ^^^^^    
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >...t4 : never
@@ -686,8 +686,8 @@ f20(42, ...t2);
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f20 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, ...boolean[]]
@@ -698,10 +698,10 @@ f20(42, "hello", ...t3);
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f20 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t3 : boolean
 >      : ^^^^^^^
 >t3 : boolean[]
@@ -712,10 +712,10 @@ f20(42, "hello", ...t2, true);
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f20 : <T extends unknown[]>(...args: T) => T
 >    : ^ ^^^^^^^^^         ^^^^^    ^^ ^^^^^ 
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >...t2 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t2 : [string, ...boolean[]]
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index 4d654354a13..5e072df85e9 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -1,5 +1,5 @@
-genericRestParameters3.ts(17,11): error TS2345: Argument of type '[number]' is not assignable to parameter of type '[string] | [number, boolean]'.
-  Type '[number]' is not assignable to type '[string]'.
+genericRestParameters3.ts(17,11): error TS2345: Argument of type '[10]' is not assignable to parameter of type '[string] | [number, boolean]'.
+  Type '[10]' is not assignable to type '[string]'.
     Type 'number' is not assignable to type 'string'.
 genericRestParameters3.ts(18,1): error TS2345: Argument of type '[]' is not assignable to parameter of type '[string] | [number, boolean]'.
   Type '[]' is not assignable to type '[number, boolean]'.
@@ -19,8 +19,8 @@ genericRestParameters3.ts(36,21): error TS2345: Argument of type 'number' is not
 genericRestParameters3.ts(37,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 '[cb: (...args: any[]) => void]'.
-genericRestParameters3.ts(44,32): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type 'CoolArray<number>'.
-  Property 'hello' is missing in type '[number, number]' but required in type 'CoolArray<number>'.
+genericRestParameters3.ts(44,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>'.
 genericRestParameters3.ts(49,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>'.
 genericRestParameters3.ts(50,5): error TS2345: Argument of type '[number]' is not assignable to parameter of type 'CoolArray<unknown>'.
@@ -29,8 +29,8 @@ genericRestParameters3.ts(51,5): error TS2345: Argument of type '[number, number
   Property 'hello' is missing in type '[number, number]' but required in type 'CoolArray<unknown>'.
 genericRestParameters3.ts(52,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>'.
-genericRestParameters3.ts(59,5): error TS2345: Argument of type '[string]' is not assignable to parameter of type '[] | [number, string]'.
-  Type '[string]' is not assignable to type '[number, string]'.
+genericRestParameters3.ts(59,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]'.
     Source has 1 element(s) but target requires 2.
 
 
@@ -53,8 +53,8 @@ genericRestParameters3.ts(59,5): error TS2345: Argument of type '[string]' is no
     f1("foo", ...t4);
     f1("foo", 10);  // Error
               ~~
-!!! error TS2345: Argument of type '[number]' is not assignable to parameter of type '[string] | [number, boolean]'.
-!!! error TS2345:   Type '[number]' is not assignable to type '[string]'.
+!!! error TS2345: Argument of type '[10]' is not assignable to parameter of type '[string] | [number, boolean]'.
+!!! error TS2345:   Type '[10]' is not assignable to type '[string]'.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
     f1("foo");  // Error
     ~~~~~~~~~
@@ -109,8 +109,8 @@ genericRestParameters3.ts(59,5): error TS2345: Argument of type '[string]' is no
     let a = bar(10, 20);
     let b = bar<CoolArray<number>>(10, 20);  // Error
                                    ~~~~~~
-!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type 'CoolArray<number>'.
-!!! error TS2345:   Property 'hello' is missing in type '[number, number]' 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 genericRestParameters3.ts:30:5: 'hello' is declared here.
     
     declare function baz<T>(...args: CoolArray<T>): void;
@@ -144,8 +144,8 @@ genericRestParameters3.ts(59,5): error TS2345: Argument of type '[string]' is no
     hmm(1, "s"); // okay, A = [1, "s"]
     hmm("what"); // no error?  A = [] | [number, string] ?
         ~~~~~~
-!!! error TS2345: Argument of type '[string]' is not assignable to parameter of type '[] | [number, string]'.
-!!! error TS2345:   Type '[string]' is not assignable to type '[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:     Source has 1 element(s) but target requires 2.
     
     // Repro from #35066
diff --git a/tests/baselines/reference/genericRestParameters3.types b/tests/baselines/reference/genericRestParameters3.types
index f172d6bd0e2..71754befe96 100644
--- a/tests/baselines/reference/genericRestParameters3.types
+++ b/tests/baselines/reference/genericRestParameters3.types
@@ -54,20 +54,20 @@ f1("foo", "abc");
 >                 : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 f1("foo", 10, true);
 >f1("foo", 10, true) : void
 >                    : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
->10 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>10 : 10
+>   : ^^
 >true : true
 >     : ^^^^
 
@@ -76,8 +76,8 @@ f1("foo", ...t1);
 >                 : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >...t1 : string | number | boolean
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >t1 : [string] | [number, boolean]
@@ -88,8 +88,8 @@ f1("foo", ...t2);
 >                 : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >...t2 : string | number | boolean
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >t2 : [number, boolean] | readonly [string]
@@ -100,8 +100,8 @@ f1("foo", ...t3);
 >                 : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >...t3 : string | number | boolean
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >t3 : [string] | readonly [number, boolean]
@@ -112,8 +112,8 @@ f1("foo", ...t4);
 >                 : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >...t4 : string | number | boolean
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >t4 : readonly [string] | readonly [number, boolean]
@@ -124,18 +124,18 @@ f1("foo", 10);  // Error
 >              : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
->10 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>10 : 10
+>   : ^^
 
 f1("foo");  // Error
 >f1("foo") : void
 >          : ^^^^
 >f1 : (x: string, ...args: [string] | [number, boolean]) => void
 >   : ^ ^^      ^^^^^    ^^                            ^^^^^    
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 f2 = f1;
 >f2 = f1 : (x: string, ...args: [string] | [number, boolean]) => void
@@ -241,10 +241,10 @@ let a = bar(10, 20);
 >            : ^^^^^^^^^^^^^^^^
 >bar : <T extends any[]>(...args: T) => T
 >    : ^ ^^^^^^^^^     ^^^^^    ^^ ^^^^^ 
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let b = bar<CoolArray<number>>(10, 20);  // Error
 >b : CoolArray<number>
@@ -253,10 +253,10 @@ let b = bar<CoolArray<number>>(10, 20);  // Error
 >                               : ^^^^^^^^^^^^^^^^^
 >bar : <T extends any[]>(...args: T) => T
 >    : ^ ^^^^^^^^^     ^^^^^    ^^ ^^^^^ 
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 declare function baz<T>(...args: CoolArray<T>): void;
 >baz : <T>(...args: CoolArray<T>) => void
@@ -279,18 +279,18 @@ baz(1);      // Error
 >       : ^^^^
 >baz : <T>(...args: CoolArray<T>) => void
 >    : ^ ^^^^^    ^^            ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 baz(1, 2);   // Error
 >baz(1, 2) : void
 >          : ^^^^
 >baz : <T>(...args: CoolArray<T>) => void
 >    : ^ ^^^^^    ^^            ^^^^^    
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 baz(...ca);  // Error
 >baz(...ca) : void
@@ -331,7 +331,7 @@ hmm("what"); // no error?  A = [] | [number, string] ?
 >            : ^^^^
 >hmm : <A extends [] | [number, string]>(...args: A) => void
 >    : ^ ^^^^^^^^^                     ^^^^^    ^^ ^^^^^    
->"what" : string
+>"what" : "what"
 >       : ^^^^^^
 
 // Repro from #35066
@@ -347,8 +347,8 @@ let x2: ReadonlyArray<string> = ["hello"];
 >   : ^^^^^^^^^^^^^^^^^
 >["hello"] : string[]
 >          : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 foo2(...x2);
 >foo2(...x2) : void
diff --git a/tests/baselines/reference/genericReversingTypeParameters.types b/tests/baselines/reference/genericReversingTypeParameters.types
index 500daceaaef..0d841756ec1 100644
--- a/tests/baselines/reference/genericReversingTypeParameters.types
+++ b/tests/baselines/reference/genericReversingTypeParameters.types
@@ -39,8 +39,8 @@ var r1 = b.get('');
 >  : ^^^^^^^^^^^^^^^^^^^^^
 >get : (key: string) => number
 >    : ^   ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var i = b.inverse(); // used to get the type wrong here.
 >i : BiMap<number, string>
@@ -65,6 +65,6 @@ var r2b = i.get(1);
 >  : ^^^^^^^^^^^^^^^^^^^^^
 >get : (key: number) => string
 >    : ^   ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericReversingTypeParameters2.types b/tests/baselines/reference/genericReversingTypeParameters2.types
index c4177b9e503..c21115317d6 100644
--- a/tests/baselines/reference/genericReversingTypeParameters2.types
+++ b/tests/baselines/reference/genericReversingTypeParameters2.types
@@ -51,6 +51,6 @@ var r2b = i.get(1);
 >  : ^^^^^^^^^^^^^^^^^^^^^
 >get : (key: number) => string
 >    : ^   ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/genericSetterInClassType.types b/tests/baselines/reference/genericSetterInClassType.types
index 712234a5a07..e44c81a85ae 100644
--- a/tests/baselines/reference/genericSetterInClassType.types
+++ b/tests/baselines/reference/genericSetterInClassType.types
@@ -16,8 +16,8 @@ module Generic {
             return 1 as never;
 >1 as never : never
 >           : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
         set y(v) { }
 >y : T
@@ -88,8 +88,8 @@ module Generic {
     }
     
     new Box<number>().value = 3;
->new Box<number>().value = 3 : number
->                            : ^^^^^^
+>new Box<number>().value = 3 : 3
+>                            : ^
 >new Box<number>().value : number
 >                        : ^^^^^^
 >new Box<number>() : Box<number>
@@ -98,6 +98,6 @@ module Generic {
 >    : ^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 }
diff --git a/tests/baselines/reference/genericSetterInClassTypeJsDoc.types b/tests/baselines/reference/genericSetterInClassTypeJsDoc.types
index 975c6a1dc7d..e128037dd9c 100644
--- a/tests/baselines/reference/genericSetterInClassTypeJsDoc.types
+++ b/tests/baselines/reference/genericSetterInClassTypeJsDoc.types
@@ -59,18 +59,18 @@
 }
 
 new Box(3).value = 3;
->new Box(3).value = 3 : number
->                     : ^^^^^^
+>new Box(3).value = 3 : 3
+>                     : ^
 >new Box(3).value : number
 >                 : ^^^^^^
 >new Box(3) : Box<number>
 >           : ^^^^^^^^^^^
 >Box : typeof Box
 >    : ^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >value : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/genericSpecializations3.types b/tests/baselines/reference/genericSpecializations3.types
index 23cff506ec7..23823d193ad 100644
--- a/tests/baselines/reference/genericSpecializations3.types
+++ b/tests/baselines/reference/genericSpecializations3.types
@@ -22,8 +22,8 @@ iFoo.foo(1);
 >     : ^^^^^^^^^^^^
 >foo : (x: number) => number
 >    : ^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class IntFooBad implements IFoo<number> { // error
 >IntFooBad : IntFooBad
@@ -79,8 +79,8 @@ stringFoo2.foo("hm");
 >           : ^^^^^^^^^^
 >foo : (x: string) => string
 >    : ^ ^^      ^^^^^      
->"hm" : string
->     : ^^^^^^
+>"hm" : "hm"
+>     : ^^^^
 
 
 intFoo = stringFoo2; // error
diff --git a/tests/baselines/reference/genericStaticAnyTypeFunction.types b/tests/baselines/reference/genericStaticAnyTypeFunction.types
index 2f00fb12250..77598bbbde3 100644
--- a/tests/baselines/reference/genericStaticAnyTypeFunction.types
+++ b/tests/baselines/reference/genericStaticAnyTypeFunction.types
@@ -41,8 +41,8 @@ class A {
 >    : ^^^^^^      ^^   ^^     ^^      ^^^^^   
 >source : T
 >       : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     }
 
diff --git a/tests/baselines/reference/genericTupleWithSimplifiableElements.types b/tests/baselines/reference/genericTupleWithSimplifiableElements.types
index dde0d3929e7..9096358dde9 100644
--- a/tests/baselines/reference/genericTupleWithSimplifiableElements.types
+++ b/tests/baselines/reference/genericTupleWithSimplifiableElements.types
@@ -14,8 +14,8 @@ let y: [t: "AAA", ...args: { [S in SS1]: [a: number]; }[SS1]] = ["AAA", 1];
 >           : ^^^^^^^^^^^^^^^
 >"AAA" : "AAA"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 type SS2 = "1" | "2" | "3";
 >SS2 : SS2
@@ -28,8 +28,8 @@ let z: [t: "AAA", ...args: { [S in SS2]: [a: number]; }[SS2]] = ["AAA", 1];
 >           : ^^^^^^^^^^^^^^^
 >"AAA" : "AAA"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class I<SS extends string>{
 >I : I<SS>
diff --git a/tests/baselines/reference/genericTypeAliases.types b/tests/baselines/reference/genericTypeAliases.types
index b98a2c9a373..90aceb16c38 100644
--- a/tests/baselines/reference/genericTypeAliases.types
+++ b/tests/baselines/reference/genericTypeAliases.types
@@ -78,7 +78,7 @@ ls = () => "lazy";
 >   : ^^^^^^^^^^^^
 >() => "lazy" : () => string
 >             : ^^^^^^^^^^^^
->"lazy" : string
+>"lazy" : "lazy"
 >       : ^^^^^^
 
 type Foo<T> = T | { x: Foo<T> };
@@ -203,12 +203,12 @@ var s: Strange<number>;
 >  : ^^^^^^
 
 s = "hello";
->s = "hello" : string
->            : ^^^^^^
+>s = "hello" : "hello"
+>            : ^^^^^^^
 >s : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 interface AB<A, B> {
     a: A;
@@ -235,31 +235,31 @@ var p: TaggedPair<number>;
 >  : ^^^^^^^^^^^^^^^^^^
 
 p.a = 1;
->p.a = 1 : number
->        : ^^^^^^
+>p.a = 1 : 1
+>        : ^
 >p.a : number
 >    : ^^^^^^
 >p : TaggedPair<number>
 >  : ^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 p.b = 2;
->p.b = 2 : number
->        : ^^^^^^
+>p.b = 2 : 2
+>        : ^
 >p.b : number
 >    : ^^^^^^
 >p : TaggedPair<number>
 >  : ^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 p.tag = "test";
->p.tag = "test" : string
+>p.tag = "test" : "test"
 >               : ^^^^^^
 >p.tag : string
 >      : ^^^^^^
@@ -267,7 +267,7 @@ p.tag = "test";
 >  : ^^^^^^^^^^^^^^^^^^
 >tag : string
 >    : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 function f<A>() {
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.types b/tests/baselines/reference/genericWithOpenTypeParameters1.types
index cbc7536164b..eb17dba87db 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.types
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.types
@@ -25,8 +25,8 @@ x.foo(1); // no error
 >  : ^^^^^^^^^
 >foo : (x: number) => number
 >    : ^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f = <T>(x: B<T>) => { return x.foo(1); } // error
 >f : <T>(x: B<T>) => T
@@ -97,6 +97,6 @@ var f4 = (x: B<number>) => { return x.foo(1); } // no error
 >  : ^^^^^^^^^
 >foo : (x: number) => number
 >    : ^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType.types b/tests/baselines/reference/getAndSetNotIdenticalType.types
index 35fa0a89fb7..1d21ae32371 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType.types
+++ b/tests/baselines/reference/getAndSetNotIdenticalType.types
@@ -10,8 +10,8 @@ class C {
 >  : ^^^^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
     set x(v: string) { }
 >x : number
diff --git a/tests/baselines/reference/getSetAccessorContextualTyping.types b/tests/baselines/reference/getSetAccessorContextualTyping.types
index 3e50b7610e6..c900fa6e385 100644
--- a/tests/baselines/reference/getSetAccessorContextualTyping.types
+++ b/tests/baselines/reference/getSetAccessorContextualTyping.types
@@ -20,8 +20,8 @@ class C {
 >  : ^^^^^^
 
         return "string";  // Error; get contextual type by set accessor parameter type annotation
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
     }
 
     set Y(y) { }
@@ -65,7 +65,7 @@ class C {
 >  : ^^^^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/getsetReturnTypes.types b/tests/baselines/reference/getsetReturnTypes.types
index 9fd7896eca1..3ccc0446457 100644
--- a/tests/baselines/reference/getsetReturnTypes.types
+++ b/tests/baselines/reference/getsetReturnTypes.types
@@ -27,8 +27,8 @@ var x = makePoint(2).x;
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >makePoint : (x: number) => { readonly x: number; }
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >x : number
 >  : ^^^^^^
 
@@ -41,8 +41,8 @@ var y: number = makePoint(2).x;
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >makePoint : (x: number) => { readonly x: number; }
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >x : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/getterControlFlowStrictNull.types b/tests/baselines/reference/getterControlFlowStrictNull.types
index c70ff05a203..6bd6a5d9885 100644
--- a/tests/baselines/reference/getterControlFlowStrictNull.types
+++ b/tests/baselines/reference/getterControlFlowStrictNull.types
@@ -24,8 +24,8 @@ class A {
 >    : ^^^
 
             return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
         }
 
         // it does error here as expected
@@ -54,8 +54,8 @@ class B {
 >    : ^^^
 
             return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
         }
 
         // it should error here because it returns undefined
@@ -84,8 +84,8 @@ class C {
 >    : ^^^
 
             return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
 
         // it should error here because it returns undefined
diff --git a/tests/baselines/reference/getterSetterSubtypeAssignment.types b/tests/baselines/reference/getterSetterSubtypeAssignment.types
index d645afc062d..c38f139e757 100644
--- a/tests/baselines/reference/getterSetterSubtypeAssignment.types
+++ b/tests/baselines/reference/getterSetterSubtypeAssignment.types
@@ -20,8 +20,8 @@ class NumberOrUndefined {
 >     : ^^^^
 >_x : number | undefined
 >   : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set x(value: number | undefined) { this._x = value; }
 >x : number
@@ -170,8 +170,8 @@ class NumberOrString {
     _x: number | string = 0;
 >_x : string | number
 >   : ^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     get x(): number { return typeof this._x === 'number' ? this._x : Number(this._x); }
 >x : number
diff --git a/tests/baselines/reference/gettersAndSetters.types b/tests/baselines/reference/gettersAndSetters.types
index 5b4b51048df..0e4771d9476 100644
--- a/tests/baselines/reference/gettersAndSetters.types
+++ b/tests/baselines/reference/gettersAndSetters.types
@@ -15,8 +15,8 @@ class C {
     static barBack:string = "";
 >barBack : string
 >        : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     public bazBack = "";
 >bazBack : string
@@ -108,7 +108,7 @@ var foo = c.Foo;
 >    : ^^^^^^
 
 c.Foo = "foov";
->c.Foo = "foov" : string
+>c.Foo = "foov" : "foov"
 >               : ^^^^^^
 >c.Foo : string
 >      : ^^^^^^
@@ -116,7 +116,7 @@ c.Foo = "foov";
 >  : ^
 >Foo : string
 >    : ^^^^^^
->"foov" : string
+>"foov" : "foov"
 >       : ^^^^^^
 
 var bar = C.Bar;
@@ -130,7 +130,7 @@ var bar = C.Bar;
 >    : ^^^^^^
 
 C.Bar = "barv";
->C.Bar = "barv" : string
+>C.Bar = "barv" : "barv"
 >               : ^^^^^^
 >C.Bar : string
 >      : ^^^^^^
@@ -138,7 +138,7 @@ C.Bar = "barv";
 >  : ^^^^^^^^
 >Bar : string
 >    : ^^^^^^
->"barv" : string
+>"barv" : "barv"
 >       : ^^^^^^
 
 var baz = c.Baz;
@@ -173,8 +173,8 @@ var o : {Foo:number;} = {get Foo() {return 0;}, set Foo(val:number){val}}; // o
 >                                                  : ^^^^^^^^^^^^^^^^
 >Foo : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >Foo : number
 >    : ^^^^^^
 >val : number
@@ -193,16 +193,16 @@ var ofg = o.Foo;
 >    : ^^^^^^
 
 o.Foo = 0;
->o.Foo = 0 : number
->          : ^^^^^^
+>o.Foo = 0 : 0
+>          : ^
 >o.Foo : number
 >      : ^^^^^^
 >o : { Foo: number; }
 >  : ^^^^^^^      ^^^
 >Foo : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
 interface I1 {
@@ -225,8 +225,8 @@ var i:I1 = function (n) {return n;}
 const x: string | number = Math.random() < 0.5 ? "str" : 123;
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->Math.random() < 0.5 ? "str" : 123 : string | number
->                                  : ^^^^^^^^^^^^^^^
+>Math.random() < 0.5 ? "str" : 123 : "str" | 123
+>                                  : ^^^^^^^^^^^
 >Math.random() < 0.5 : boolean
 >                    : ^^^^^^^
 >Math.random() : number
@@ -239,10 +239,10 @@ const x: string | number = Math.random() < 0.5 ? "str" : 123;
 >       : ^^^^^^      
 >0.5 : 0.5
 >    : ^^^
->"str" : string
->      : ^^^^^^
->123 : number
->    : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
+>123 : 123
+>    : ^^^
 
 if (typeof x === "string") {
 >typeof x === "string" : boolean
diff --git a/tests/baselines/reference/gettersAndSettersAccessibility.types b/tests/baselines/reference/gettersAndSettersAccessibility.types
index 5e7a611f2be..aaad3341477 100644
--- a/tests/baselines/reference/gettersAndSettersAccessibility.types
+++ b/tests/baselines/reference/gettersAndSettersAccessibility.types
@@ -8,8 +8,8 @@ class C99 {
 	private get Baz():number { return 0; }
 >Baz : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 	public set Baz(n:number) {} // error - accessors do not agree in visibility
 >Baz : number
diff --git a/tests/baselines/reference/gettersAndSettersErrors.types b/tests/baselines/reference/gettersAndSettersErrors.types
index 09de1267c2d..8b921d0dc3e 100644
--- a/tests/baselines/reference/gettersAndSettersErrors.types
+++ b/tests/baselines/reference/gettersAndSettersErrors.types
@@ -8,8 +8,8 @@ class C {
     public get Foo() { return "foo";} // ok
 >Foo : string
 >    : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
     public set Foo(foo:string) {} // ok
 >Foo : string
@@ -43,8 +43,8 @@ class E {
     private get Baz():number { return 0; }
 >Baz : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public set Baz(n:number) {} // error - accessors do not agree in visibility
 >Baz : number
diff --git a/tests/baselines/reference/gettersAndSettersTypesAgree.types b/tests/baselines/reference/gettersAndSettersTypesAgree.types
index 015d649ea45..18074b35ba9 100644
--- a/tests/baselines/reference/gettersAndSettersTypesAgree.types
+++ b/tests/baselines/reference/gettersAndSettersTypesAgree.types
@@ -20,8 +20,8 @@ class C {
     public get Bar() { return "foo";} // ok
 >Bar : string
 >    : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
     public set Bar(bar:string) {} // ok - type must be declared
 >Bar : string
@@ -51,8 +51,8 @@ var o2 = {get Foo(){return 0;}, set Foo(val:number){}}; // ok - types agree
 >                                              : ^^^^^^^^^^^^^^^^
 >Foo : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >Foo : number
 >    : ^^^^^^
 >val : number
diff --git a/tests/baselines/reference/global.types b/tests/baselines/reference/global.types
index d88ac7de858..1cc7fc64e77 100644
--- a/tests/baselines/reference/global.types
+++ b/tests/baselines/reference/global.types
@@ -36,7 +36,7 @@ M.f(3);
 >  : ^^^^^^^^
 >f : (y: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 
diff --git a/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types b/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
index 6419e2909f3..3b1d2ae7223 100644
--- a/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
+++ b/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
@@ -2,16 +2,16 @@
 
 === bug27099.js ===
 window.name = 1;
->window.name = 1 : number
->                : ^^^^^^
+>window.name = 1 : 1
+>                : ^
 >window.name : string
 >            : ^^^^^^
 >window : Window & typeof globalThis
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 window.console; // should not have error: Property 'console' does not exist on type 'typeof window'.
 >window.console : Console
diff --git a/tests/baselines/reference/globalThisReadonlyProperties.types b/tests/baselines/reference/globalThisReadonlyProperties.types
index 8ca9a7aaf59..71ef4057391 100644
--- a/tests/baselines/reference/globalThisReadonlyProperties.types
+++ b/tests/baselines/reference/globalThisReadonlyProperties.types
@@ -28,16 +28,16 @@ const y = 2
 >  : ^
 
 globalThis.x = 3
->globalThis.x = 3 : number
->                 : ^^^^^^
+>globalThis.x = 3 : 3
+>                 : ^
 >globalThis.x : number
 >             : ^^^^^^
 >globalThis : typeof globalThis
 >           : ^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 globalThis.y = 4 // should error
 >globalThis.y = 4 : 4
diff --git a/tests/baselines/reference/heterogeneousArrayAndOverloads.types b/tests/baselines/reference/heterogeneousArrayAndOverloads.types
index 0b66740fa2e..15413710ad1 100644
--- a/tests/baselines/reference/heterogeneousArrayAndOverloads.types
+++ b/tests/baselines/reference/heterogeneousArrayAndOverloads.types
@@ -38,14 +38,14 @@ class arrTest {
 >     : ^^^    ^^        ^^^^^^^^^    ^^        ^^^^^^^^^
 >[1, 2, 3, 5] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>5 : 5
+>  : ^
 
         this.test(["hi"]);
 >this.test(["hi"]) : any
@@ -58,8 +58,8 @@ class arrTest {
 >     : ^^^    ^^        ^^^^^^^^^    ^^        ^^^^^^^^^
 >["hi"] : string[]
 >       : ^^^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
         this.test([]);
 >this.test([]) : any
@@ -84,13 +84,13 @@ class arrTest {
 >     : ^^^    ^^        ^^^^^^^^^    ^^        ^^^^^^^^^
 >[1, 2, "hi", 5] : (string | number)[]
 >                : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"hi" : string
->     : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"hi" : "hi"
+>     : ^^^^
+>5 : 5
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/hidingCallSignatures.types b/tests/baselines/reference/hidingCallSignatures.types
index e658d112543..9a4a6f76c2c 100644
--- a/tests/baselines/reference/hidingCallSignatures.types
+++ b/tests/baselines/reference/hidingCallSignatures.types
@@ -34,16 +34,16 @@ d(""); // number
 >      : ^^^^^^
 >d : D
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 new d(""); // should be string
 >new d("") : string
 >          : ^^^^^^
 >d : D
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var f: F;
 >f : F
@@ -54,8 +54,8 @@ f(""); // string
 >      : ^^^^^^
 >f : F
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var e: E;
 >e : E
@@ -66,6 +66,6 @@ e(""); // {}
 >      : ^^
 >e : E
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/hidingConstructSignatures.types b/tests/baselines/reference/hidingConstructSignatures.types
index df4e330e003..283974e2bd3 100644
--- a/tests/baselines/reference/hidingConstructSignatures.types
+++ b/tests/baselines/reference/hidingConstructSignatures.types
@@ -34,16 +34,16 @@ d(""); // string
 >      : ^^^^^^
 >d : D
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 new d(""); // should be number
 >new d("") : number
 >          : ^^^^^^
 >d : D
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var f: F;
 >f : F
@@ -54,8 +54,8 @@ new f(""); // string
 >          : ^^^^^^
 >f : F
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var e: E;
 >e : E
@@ -66,6 +66,6 @@ new e(""); // {}
 >          : ^^
 >e : E
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/homomorphicMappedTypeWithNonHomomorphicInstantiationSpreadable1.types b/tests/baselines/reference/homomorphicMappedTypeWithNonHomomorphicInstantiationSpreadable1.types
index 194f3446cc6..c1e144ec37c 100644
--- a/tests/baselines/reference/homomorphicMappedTypeWithNonHomomorphicInstantiationSpreadable1.types
+++ b/tests/baselines/reference/homomorphicMappedTypeWithNonHomomorphicInstantiationSpreadable1.types
@@ -53,8 +53,8 @@ const result = func1({
         label: "first",
 >label : string
 >      : ^^^^^^
->"first" : string
->        : ^^^^^^
+>"first" : "first"
+>        : ^^^^^^^
 
         options: [
 >options : [{ value: number; }, { value: string; }]
@@ -68,8 +68,8 @@ const result = func1({
                 value: 123,
 >value : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
             },
             {
@@ -79,8 +79,8 @@ const result = func1({
                 value: "foo",
 >value : string
 >      : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
             },
         ],
@@ -94,8 +94,8 @@ const result = func1({
         label: "second",
 >label : string
 >      : ^^^^^^
->"second" : string
->         : ^^^^^^
+>"second" : "second"
+>         : ^^^^^^^^
 
         options: [
 >options : [{ value: string; }, { value: true; }]
@@ -109,8 +109,8 @@ const result = func1({
                 value: "bar",
 >value : string
 >      : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
             },
             {
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index 9df4bd6eb1e..b97dda14f73 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -53,8 +53,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 function F2(x: number): boolean { return x < 42; }
 >F2 : (x: number) => boolean
diff --git a/tests/baselines/reference/ignoredJsxAttributes.types b/tests/baselines/reference/ignoredJsxAttributes.types
index a02effca8bb..158233eda40 100644
--- a/tests/baselines/reference/ignoredJsxAttributes.types
+++ b/tests/baselines/reference/ignoredJsxAttributes.types
@@ -42,14 +42,14 @@ let props: Props = {
     foo: "",
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     "data-yadda": 42,  // Error
 >"data-yadda" : number
 >             : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 };
 
@@ -64,8 +64,8 @@ let x1 = <Yadda foo="hello" data-yadda={42}/>;
 >    : ^^^^^^
 >data-yadda : number
 >           : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let x2 = <Yadda bar="hello" data-yadda={42}/>;  // Error
 >x2 : JSX.Element
@@ -78,6 +78,6 @@ let x2 = <Yadda bar="hello" data-yadda={42}/>;  // Error
 >    : ^^^^^^
 >data-yadda : number
 >           : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/illegalSuperCallsInConstructor.types b/tests/baselines/reference/illegalSuperCallsInConstructor.types
index 1a72281e805..ec23560753c 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.types
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.types
@@ -64,8 +64,8 @@ class Derived extends Base {
 >      : ^^^
 
                 return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             },
             set foo(v: number) {
diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.types b/tests/baselines/reference/implicitAnyFromCircularInference.types
index fc9c2085bfc..01cee0ae77c 100644
--- a/tests/baselines/reference/implicitAnyFromCircularInference.types
+++ b/tests/baselines/reference/implicitAnyFromCircularInference.types
@@ -107,8 +107,8 @@ function foo(x: A): string { return "abc"; }
 >    : ^ ^^ ^^^^^      
 >x : A
 >  : ^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
index cacf0c35e03..b9ef09d20d7 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
@@ -84,8 +84,8 @@ testFunctionExprC2((v1, v2) => 1);
 >   : ^^^
 >v2 : any
 >   : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 testObjLiteral(objL);
 >testObjLiteral(objL) : void
diff --git a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.types b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.types
index 07cfe9bf8c5..a6be9100d53 100644
--- a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.types
+++ b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.types
@@ -47,8 +47,8 @@ function bar1(): any { return undefined; }
 function fooBar(): number { return 1; }
 >fooBar : () => number
 >       : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function fooFoo() { return 5; }
 >fooFoo : () => number
diff --git a/tests/baselines/reference/implicitAnyGenerics.types b/tests/baselines/reference/implicitAnyGenerics.types
index 82484bb7d58..07cf56c42e5 100644
--- a/tests/baselines/reference/implicitAnyGenerics.types
+++ b/tests/baselines/reference/implicitAnyGenerics.types
@@ -66,8 +66,8 @@ var d2 = new D(1);
 >         : ^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var d3 = new D<any>(1);
 >d3 : D<any>
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.types b/tests/baselines/reference/implicitAnyWidenToAny.types
index 3d65c9e8fc5..fd148986b0e 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.types
+++ b/tests/baselines/reference/implicitAnyWidenToAny.types
@@ -60,8 +60,8 @@ var foo2: any = undefined;
 var temp: number = 5;
 >temp : number
 >     : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 var c: AnimalObj = { x: null }; 
 >c : AnimalObj
@@ -130,8 +130,8 @@ var obj0 = new objLit(1);
 >              : ^^^
 >objLit : new (n: number) => any
 >       : ^^^^^ ^^      ^^^^^   
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var obj1 = anyReturnFunc();
 >obj1 : any
diff --git a/tests/baselines/reference/implicitConstParameters.types b/tests/baselines/reference/implicitConstParameters.types
index fbdbf4ca5f4..778394a6e2e 100644
--- a/tests/baselines/reference/implicitConstParameters.types
+++ b/tests/baselines/reference/implicitConstParameters.types
@@ -157,12 +157,12 @@ function f4(x: string | undefined) {
 >  : ^^^^^^^^^^^^^^^^^^
 
     x = "abc";
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     if (x) {
 >x : string
@@ -209,12 +209,12 @@ function f5(x: string | undefined) {
 >       : ^^^^^^
     }
     x = "abc";  // causes x to be considered non-const
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 }
 
 
@@ -231,8 +231,8 @@ function f6(x: string | undefined) {
 >        : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     if (x) {
 >x : string | undefined
diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types
index a094d7ca863..e967e4fc9d3 100644
--- a/tests/baselines/reference/implicitIndexSignatures.types
+++ b/tests/baselines/reference/implicitIndexSignatures.types
@@ -52,12 +52,12 @@ map = { x: "xxx", y: "yyy" };
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"xxx" : string
->      : ^^^^^^
+>"xxx" : "xxx"
+>      : ^^^^^
 >y : string
 >  : ^^^^^^
->"yyy" : string
->      : ^^^^^^
+>"yyy" : "yyy"
+>      : ^^^^^
 
 map = empty1;
 >map = empty1 : {}
diff --git a/tests/baselines/reference/importAliasIdentifiers.types b/tests/baselines/reference/importAliasIdentifiers.types
index c5edf208212..0204cf9246d 100644
--- a/tests/baselines/reference/importAliasIdentifiers.types
+++ b/tests/baselines/reference/importAliasIdentifiers.types
@@ -70,12 +70,12 @@ module clodule {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 import clolias = clodule;
@@ -140,12 +140,12 @@ module fundule {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 import funlias = fundule;
diff --git a/tests/baselines/reference/importAssertion1(module=commonjs).types b/tests/baselines/reference/importAssertion1(module=commonjs).types
index 9827b455e00..8c64e06b78f 100644
--- a/tests/baselines/reference/importAssertion1(module=commonjs).types
+++ b/tests/baselines/reference/importAssertion1(module=commonjs).types
@@ -99,16 +99,16 @@ const a = import('./0')
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0') : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 
 const b = import('./0', { assert: { type: "json" } })
 >b : Promise<typeof import("0")>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -117,7 +117,7 @@ const b = import('./0', { assert: { type: "json" } })
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
@@ -125,8 +125,8 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
 >                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; ttype: string; }
@@ -135,11 +135,11 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 >ttype : string
 >      : ^^^^^^
->"typo" : string
+>"typo" : "typo"
 >       : ^^^^^^
 
 const d = import('./0', { assert: {} })
@@ -147,8 +147,8 @@ const d = import('./0', { assert: {} })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: {} }) : Promise<typeof import("0")>
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: {} } : { assert: {}; }
 >               : ^^^^^^^^^^^^^^^
 >assert : {}
@@ -161,8 +161,8 @@ const dd = import('./0', {})
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}) : Promise<typeof import("0")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -175,8 +175,8 @@ const e = import('./0', foo())
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', foo()) : Promise<typeof import("0")>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >foo() : any
 >      : ^^^
 >foo : () => any
@@ -193,8 +193,8 @@ const g = import('./0', {}, {})
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}, {}) : Promise<typeof import("0")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 >{} : {}
@@ -205,8 +205,8 @@ const h = import('./0', { assert: { type: "json" }},)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json" }} : { assert: { type: string; }; }
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -215,7 +215,7 @@ const h = import('./0', { assert: { type: "json" }},)
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 
diff --git a/tests/baselines/reference/importAssertion1(module=es2015).types b/tests/baselines/reference/importAssertion1(module=es2015).types
index 9827b455e00..8c64e06b78f 100644
--- a/tests/baselines/reference/importAssertion1(module=es2015).types
+++ b/tests/baselines/reference/importAssertion1(module=es2015).types
@@ -99,16 +99,16 @@ const a = import('./0')
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0') : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 
 const b = import('./0', { assert: { type: "json" } })
 >b : Promise<typeof import("0")>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -117,7 +117,7 @@ const b = import('./0', { assert: { type: "json" } })
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
@@ -125,8 +125,8 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
 >                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; ttype: string; }
@@ -135,11 +135,11 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 >ttype : string
 >      : ^^^^^^
->"typo" : string
+>"typo" : "typo"
 >       : ^^^^^^
 
 const d = import('./0', { assert: {} })
@@ -147,8 +147,8 @@ const d = import('./0', { assert: {} })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: {} }) : Promise<typeof import("0")>
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: {} } : { assert: {}; }
 >               : ^^^^^^^^^^^^^^^
 >assert : {}
@@ -161,8 +161,8 @@ const dd = import('./0', {})
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}) : Promise<typeof import("0")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -175,8 +175,8 @@ const e = import('./0', foo())
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', foo()) : Promise<typeof import("0")>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >foo() : any
 >      : ^^^
 >foo : () => any
@@ -193,8 +193,8 @@ const g = import('./0', {}, {})
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}, {}) : Promise<typeof import("0")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 >{} : {}
@@ -205,8 +205,8 @@ const h = import('./0', { assert: { type: "json" }},)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json" }} : { assert: { type: string; }; }
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -215,7 +215,7 @@ const h = import('./0', { assert: { type: "json" }},)
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 
diff --git a/tests/baselines/reference/importAssertion1(module=esnext).types b/tests/baselines/reference/importAssertion1(module=esnext).types
index 9827b455e00..8c64e06b78f 100644
--- a/tests/baselines/reference/importAssertion1(module=esnext).types
+++ b/tests/baselines/reference/importAssertion1(module=esnext).types
@@ -99,16 +99,16 @@ const a = import('./0')
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0') : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 
 const b = import('./0', { assert: { type: "json" } })
 >b : Promise<typeof import("0")>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -117,7 +117,7 @@ const b = import('./0', { assert: { type: "json" } })
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
@@ -125,8 +125,8 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
 >                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; ttype: string; }
@@ -135,11 +135,11 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 >ttype : string
 >      : ^^^^^^
->"typo" : string
+>"typo" : "typo"
 >       : ^^^^^^
 
 const d = import('./0', { assert: {} })
@@ -147,8 +147,8 @@ const d = import('./0', { assert: {} })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: {} }) : Promise<typeof import("0")>
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: {} } : { assert: {}; }
 >               : ^^^^^^^^^^^^^^^
 >assert : {}
@@ -161,8 +161,8 @@ const dd = import('./0', {})
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}) : Promise<typeof import("0")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -175,8 +175,8 @@ const e = import('./0', foo())
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', foo()) : Promise<typeof import("0")>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >foo() : any
 >      : ^^^
 >foo : () => any
@@ -193,8 +193,8 @@ const g = import('./0', {}, {})
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}, {}) : Promise<typeof import("0")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 >{} : {}
@@ -205,8 +205,8 @@ const h = import('./0', { assert: { type: "json" }},)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ assert: { type: "json" }} : { assert: { type: string; }; }
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -215,7 +215,7 @@ const h = import('./0', { assert: { type: "json" }},)
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 
diff --git a/tests/baselines/reference/importAssertionNonstring.errors.txt b/tests/baselines/reference/importAssertionNonstring.errors.txt
index e2a3089c3b0..81a06f27808 100644
--- a/tests/baselines/reference/importAssertionNonstring.errors.txt
+++ b/tests/baselines/reference/importAssertionNonstring.errors.txt
@@ -1,4 +1,4 @@
-mod.mts(1,37): error TS2322: Type '{ field: number; }' is not assignable to type 'ImportAttributes'.
+mod.mts(1,37): error TS2322: Type '{ field: 0; }' is not assignable to type 'ImportAttributes'.
   Property 'field' is incompatible with index signature.
     Type 'number' is not assignable to type 'string'.
 mod.mts(1,52): error TS2837: Import assertion values must be string literal expressions.
@@ -21,7 +21,7 @@ mod.mts(11,66): error TS2837: Import assertion values must be string literal exp
 ==== mod.mts (10 errors) ====
     import * as thing1 from "./mod.mjs" assert {field: 0};
                                         ~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ field: number; }' is not assignable to type 'ImportAttributes'.
+!!! error TS2322: Type '{ field: 0; }' is not assignable to type 'ImportAttributes'.
 !!! error TS2322:   Property 'field' is incompatible with index signature.
 !!! error TS2322:     Type 'number' is not assignable to type 'string'.
                                                        ~
diff --git a/tests/baselines/reference/importAssertionNonstring.types b/tests/baselines/reference/importAssertionNonstring.types
index 46f6a4321ad..23f42c74e57 100644
--- a/tests/baselines/reference/importAssertionNonstring.types
+++ b/tests/baselines/reference/importAssertionNonstring.types
@@ -28,8 +28,8 @@ import * as thing4 from "./mod.mjs" assert {field: ["a"]};
 >      : ^^^
 >["a"] : string[]
 >      : ^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 import * as thing5 from "./mod.mjs" assert {field: { a: 0 }};
 >thing5 : typeof thing1
diff --git a/tests/baselines/reference/importAttributes1(module=commonjs).types b/tests/baselines/reference/importAttributes1(module=commonjs).types
index b20df77bc87..0f7c22f0c7e 100644
--- a/tests/baselines/reference/importAttributes1(module=commonjs).types
+++ b/tests/baselines/reference/importAttributes1(module=commonjs).types
@@ -99,16 +99,16 @@ const a = import('./0')
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0') : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 
 const b = import('./0', { with: { type: "json" } })
 >b : Promise<typeof import("0")>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -117,7 +117,7 @@ const b = import('./0', { with: { type: "json" } })
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
@@ -125,8 +125,8 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
 >                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; ttype: string; }
@@ -135,11 +135,11 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 >ttype : string
 >      : ^^^^^^
->"typo" : string
+>"typo" : "typo"
 >       : ^^^^^^
 
 const d = import('./0', { with: {} })
@@ -147,8 +147,8 @@ const d = import('./0', { with: {} })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: {} }) : Promise<typeof import("0")>
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: {} } : { with: {}; }
 >             : ^^^^^^^^^^^^^
 >with : {}
@@ -161,8 +161,8 @@ const dd = import('./0', {})
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}) : Promise<typeof import("0")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -175,8 +175,8 @@ const e = import('./0', foo())
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', foo()) : Promise<typeof import("0")>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >foo() : any
 >      : ^^^
 >foo : () => any
@@ -193,8 +193,8 @@ const g = import('./0', {}, {})
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}, {}) : Promise<typeof import("0")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 >{} : {}
@@ -205,8 +205,8 @@ const h = import('./0', { with: { type: "json" }},)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json" }} : { with: { type: string; }; }
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -215,6 +215,6 @@ const h = import('./0', { with: { type: "json" }},)
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/importAttributes1(module=es2015).types b/tests/baselines/reference/importAttributes1(module=es2015).types
index b20df77bc87..0f7c22f0c7e 100644
--- a/tests/baselines/reference/importAttributes1(module=es2015).types
+++ b/tests/baselines/reference/importAttributes1(module=es2015).types
@@ -99,16 +99,16 @@ const a = import('./0')
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0') : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 
 const b = import('./0', { with: { type: "json" } })
 >b : Promise<typeof import("0")>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -117,7 +117,7 @@ const b = import('./0', { with: { type: "json" } })
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
@@ -125,8 +125,8 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
 >                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; ttype: string; }
@@ -135,11 +135,11 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 >ttype : string
 >      : ^^^^^^
->"typo" : string
+>"typo" : "typo"
 >       : ^^^^^^
 
 const d = import('./0', { with: {} })
@@ -147,8 +147,8 @@ const d = import('./0', { with: {} })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: {} }) : Promise<typeof import("0")>
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: {} } : { with: {}; }
 >             : ^^^^^^^^^^^^^
 >with : {}
@@ -161,8 +161,8 @@ const dd = import('./0', {})
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}) : Promise<typeof import("0")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -175,8 +175,8 @@ const e = import('./0', foo())
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', foo()) : Promise<typeof import("0")>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >foo() : any
 >      : ^^^
 >foo : () => any
@@ -193,8 +193,8 @@ const g = import('./0', {}, {})
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}, {}) : Promise<typeof import("0")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 >{} : {}
@@ -205,8 +205,8 @@ const h = import('./0', { with: { type: "json" }},)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json" }} : { with: { type: string; }; }
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -215,6 +215,6 @@ const h = import('./0', { with: { type: "json" }},)
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/importAttributes1(module=esnext).types b/tests/baselines/reference/importAttributes1(module=esnext).types
index b20df77bc87..0f7c22f0c7e 100644
--- a/tests/baselines/reference/importAttributes1(module=esnext).types
+++ b/tests/baselines/reference/importAttributes1(module=esnext).types
@@ -99,16 +99,16 @@ const a = import('./0')
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0') : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 
 const b = import('./0', { with: { type: "json" } })
 >b : Promise<typeof import("0")>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -117,7 +117,7 @@ const b = import('./0', { with: { type: "json" } })
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
@@ -125,8 +125,8 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
 >                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; ttype: string; }
@@ -135,11 +135,11 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 >ttype : string
 >      : ^^^^^^
->"typo" : string
+>"typo" : "typo"
 >       : ^^^^^^
 
 const d = import('./0', { with: {} })
@@ -147,8 +147,8 @@ const d = import('./0', { with: {} })
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: {} }) : Promise<typeof import("0")>
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: {} } : { with: {}; }
 >             : ^^^^^^^^^^^^^
 >with : {}
@@ -161,8 +161,8 @@ const dd = import('./0', {})
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}) : Promise<typeof import("0")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -175,8 +175,8 @@ const e = import('./0', foo())
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', foo()) : Promise<typeof import("0")>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >foo() : any
 >      : ^^^
 >foo : () => any
@@ -193,8 +193,8 @@ const g = import('./0', {}, {})
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', {}, {}) : Promise<typeof import("0")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 >{} : {}
@@ -205,8 +205,8 @@ const h = import('./0', { with: { type: "json" }},)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./0' : string
->      : ^^^^^^
+>'./0' : "./0"
+>      : ^^^^^
 >{ with: { type: "json" }} : { with: { type: string; }; }
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -215,6 +215,6 @@ const h = import('./0', { with: { type: "json" }},)
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/importAttributes6.errors.txt b/tests/baselines/reference/importAttributes6.errors.txt
index bfc8c494241..f2f160a4bd0 100644
--- a/tests/baselines/reference/importAttributes6.errors.txt
+++ b/tests/baselines/reference/importAttributes6.errors.txt
@@ -1,4 +1,4 @@
-mod.mts(1,37): error TS2322: Type '{ field: number; }' is not assignable to type 'ImportAttributes'.
+mod.mts(1,37): error TS2322: Type '{ field: 0; }' is not assignable to type 'ImportAttributes'.
   Property 'field' is incompatible with index signature.
     Type 'number' is not assignable to type 'string'.
 mod.mts(1,51): error TS2858: Import attribute values must be string literal expressions.
@@ -21,7 +21,7 @@ mod.mts(6,65): error TS2858: Import attribute values must be string literal expr
 ==== mod.mts (10 errors) ====
     import * as thing1 from "./mod.mjs" with { field: 0 };
                                         ~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ field: number; }' is not assignable to type 'ImportAttributes'.
+!!! error TS2322: Type '{ field: 0; }' is not assignable to type 'ImportAttributes'.
 !!! error TS2322:   Property 'field' is incompatible with index signature.
 !!! error TS2322:     Type 'number' is not assignable to type 'string'.
                                                       ~
diff --git a/tests/baselines/reference/importAttributes6.types b/tests/baselines/reference/importAttributes6.types
index 5f02a672181..bb218f49617 100644
--- a/tests/baselines/reference/importAttributes6.types
+++ b/tests/baselines/reference/importAttributes6.types
@@ -28,8 +28,8 @@ import * as thing4 from "./mod.mjs" with { field: ["a"] };
 >      : ^^^
 >["a"] : string[]
 >      : ^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 import * as thing5 from "./mod.mjs" with { field: { a: 0 } };
 >thing5 : typeof thing1
diff --git a/tests/baselines/reference/importAttributes7.types b/tests/baselines/reference/importAttributes7.types
index e18ee3c85f3..0b1594040ec 100644
--- a/tests/baselines/reference/importAttributes7.types
+++ b/tests/baselines/reference/importAttributes7.types
@@ -39,8 +39,8 @@ export async function f() {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./a", {        with: { a: "a", "b": "b" },    }) : Promise<typeof import("/a")>
 >                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 >{        with: { a: "a", "b": "b" },    } : { with: { a: string; b: string; }; }
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -51,12 +51,12 @@ export async function f() {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 >"b" : string
 >    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
     });
     a;
diff --git a/tests/baselines/reference/importAttributes9.types b/tests/baselines/reference/importAttributes9.types
index 976ce571b0f..f3cbc0e848f 100644
--- a/tests/baselines/reference/importAttributes9.types
+++ b/tests/baselines/reference/importAttributes9.types
@@ -38,8 +38,8 @@ async function f() {
 >                                                                                  : ^^^^^^^^^
 >import("./a", {        with: {            type: "not-json",        },    }) : Promise<typeof ns>
 >                                                                            : ^^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 >{        with: {            type: "not-json",        },    } : { with: { type: "not-json"; }; }
 >                                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpression1ES2020.types b/tests/baselines/reference/importCallExpression1ES2020.types
index 2c2b91e131b..3ff1bcaaed3 100644
--- a/tests/baselines/reference/importCallExpression1ES2020.types
+++ b/tests/baselines/reference/importCallExpression1ES2020.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,7 +65,7 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpression2ES2020.types b/tests/baselines/reference/importCallExpression2ES2020.types
index f47c5e9ee9b..9ecd73e8e55 100644
--- a/tests/baselines/reference/importCallExpression2ES2020.types
+++ b/tests/baselines/reference/importCallExpression2ES2020.types
@@ -59,6 +59,6 @@ foo(import("./0"));
 >    : ^ ^^            ^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpression3ES2020.types b/tests/baselines/reference/importCallExpression3ES2020.types
index dff1c0376d7..11a5b57b9d8 100644
--- a/tests/baselines/reference/importCallExpression3ES2020.types
+++ b/tests/baselines/reference/importCallExpression3ES2020.types
@@ -28,8 +28,8 @@ async function foo() {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 >B : typeof import("0").B
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpression4ES2020.types b/tests/baselines/reference/importCallExpression4ES2020.types
index d1b7bdb25cc..e1ef783a6df 100644
--- a/tests/baselines/reference/importCallExpression4ES2020.types
+++ b/tests/baselines/reference/importCallExpression4ES2020.types
@@ -38,8 +38,8 @@ class C {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -50,8 +50,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -108,8 +108,8 @@ class C {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
diff --git a/tests/baselines/reference/importCallExpression5ES2020.errors.txt b/tests/baselines/reference/importCallExpression5ES2020.errors.txt
index 07103ec8737..703aceefef8 100644
--- a/tests/baselines/reference/importCallExpression5ES2020.errors.txt
+++ b/tests/baselines/reference/importCallExpression5ES2020.errors.txt
@@ -1,6 +1,6 @@
 2.ts(3,23): error TS7036: Dynamic import's specifier must be of type 'string', but here has type '"./0" | undefined'.
 2.ts(4,24): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'undefined'.
-2.ts(5,24): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string | null'.
+2.ts(5,24): error TS7036: Dynamic import's specifier must be of type 'string', but here has type '"./1" | null'.
 2.ts(6,24): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'null'.
 
 
@@ -25,7 +25,7 @@
 !!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'undefined'.
     let myModule2 = import(bar() ? "./1" : null);
                            ~~~~~~~~~~~~~~~~~~~~
-!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string | null'.
+!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type '"./1" | null'.
     let myModule3 = import(null);
                            ~~~~
 !!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'null'.
diff --git a/tests/baselines/reference/importCallExpression5ES2020.types b/tests/baselines/reference/importCallExpression5ES2020.types
index 50a24b3c586..fc834692b56 100644
--- a/tests/baselines/reference/importCallExpression5ES2020.types
+++ b/tests/baselines/reference/importCallExpression5ES2020.types
@@ -65,14 +65,14 @@ let myModule2 = import(bar() ? "./1" : null);
 >          : ^^^^^^^^^^^^
 >import(bar() ? "./1" : null) : Promise<any>
 >                             : ^^^^^^^^^^^^
->bar() ? "./1" : null : string | null
->                     : ^^^^^^^^^^^^^
+>bar() ? "./1" : null : "./1" | null
+>                     : ^^^^^^^^^^^^
 >bar() : boolean
 >      : ^^^^^^^
 >bar : () => boolean
 >    : ^^^^^^       
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
 let myModule3 = import(null);
 >myModule3 : Promise<any>
diff --git a/tests/baselines/reference/importCallExpression6ES2020.types b/tests/baselines/reference/importCallExpression6ES2020.types
index f0390121b70..31095f9d23e 100644
--- a/tests/baselines/reference/importCallExpression6ES2020.types
+++ b/tests/baselines/reference/importCallExpression6ES2020.types
@@ -65,14 +65,14 @@ let myModule2 = import(bar() ? "./1" : null);
 >          : ^^^^^^^^^^^^
 >import(bar() ? "./1" : null) : Promise<any>
 >                             : ^^^^^^^^^^^^
->bar() ? "./1" : null : string
->                     : ^^^^^^
+>bar() ? "./1" : null : "./1"
+>                     : ^^^^^
 >bar() : boolean
 >      : ^^^^^^^
 >bar : () => boolean
 >    : ^^^^^^       
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
 let myModule3 = import(null);
 >myModule3 : Promise<any>
diff --git a/tests/baselines/reference/importCallExpressionAsyncES2020.types b/tests/baselines/reference/importCallExpressionAsyncES2020.types
index 718db181c0d..6582c7becd2 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES2020.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES2020.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.types b/tests/baselines/reference/importCallExpressionAsyncES5AMD.types
index f1c92a01e4b..abe34925610 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS.types b/tests/baselines/reference/importCallExpressionAsyncES5CJS.types
index 52ae58c1c70..416aa2dd2f2 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5CJS.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5System.types b/tests/baselines/reference/importCallExpressionAsyncES5System.types
index 71870b25aa0..49ea6657f08 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5System.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5System.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.types b/tests/baselines/reference/importCallExpressionAsyncES5UMD.types
index 20cea6b4456..ff63b939ecc 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.types b/tests/baselines/reference/importCallExpressionAsyncES6AMD.types
index 94aed2ee646..18857450301 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6CJS.types b/tests/baselines/reference/importCallExpressionAsyncES6CJS.types
index 65aa0d94335..a8b35bc8f09 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6CJS.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6CJS.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6System.types b/tests/baselines/reference/importCallExpressionAsyncES6System.types
index d859bd4faa7..be280be2535 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6System.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6System.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.types b/tests/baselines/reference/importCallExpressionAsyncES6UMD.types
index 9c731dc9077..26e34e0fdf7 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.types
@@ -12,8 +12,8 @@ export async function fn() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
 export class cl1 {
@@ -31,8 +31,8 @@ export class cl1 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -55,8 +55,8 @@ export const obj = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
     }
 }
 
@@ -83,8 +83,8 @@ export class cl2 {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
         }
     }
 }
@@ -102,7 +102,7 @@ export const l = async () => {
 >                       : ^^^^^^^^^^^^^^^^^^^^^
 >import('./test') : Promise<typeof import("test")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./test' : string
->         : ^^^^^^
+>'./test' : "./test"
+>         : ^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.types b/tests/baselines/reference/importCallExpressionCheckReturntype1.types
index d456dafde14..6d51f0dda69 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.types
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.types
@@ -26,8 +26,8 @@ let p1: Promise<typeof anotherModule> = import("./defaultPath");
 >              : ^^^^^^^^^^^^^^^^^^^^
 >import("./defaultPath") : Promise<typeof defaultModule>
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./defaultPath" : string
->                : ^^^^^^
+>"./defaultPath" : "./defaultPath"
+>                : ^^^^^^^^^^^^^^^
 
 let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
 >p2 : Promise<typeof anotherModule>
@@ -36,8 +36,8 @@ let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
 >                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./defaultPath") : Promise<typeof defaultModule>
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./defaultPath" : string
->                : ^^^^^^
+>"./defaultPath" : "./defaultPath"
+>                : ^^^^^^^^^^^^^^^
 >anotherModule : typeof anotherModule
 >              : ^^^^^^^^^^^^^^^^^^^^
 
@@ -46,6 +46,6 @@ let p3: Promise<any> = import("./defaultPath");
 >   : ^^^^^^^^^^^^
 >import("./defaultPath") : Promise<typeof defaultModule>
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./defaultPath" : string
->                : ^^^^^^
+>"./defaultPath" : "./defaultPath"
+>                : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit1.types b/tests/baselines/reference/importCallExpressionDeclarationEmit1.types
index 4aedbc9a6f8..b86fd3bea8c 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit1.types
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit1.types
@@ -60,8 +60,8 @@ const p2 = import(whatToLoad ? getSpecifier() : "defaulPath")
 >               : ^^^^^^
 >getSpecifier : () => string
 >             : ^^^^^^      
->"defaulPath" : string
->             : ^^^^^^
+>"defaulPath" : "defaulPath"
+>             : ^^^^^^^^^^^^
 
 function returnDynamicLoad(path: string) {
 >returnDynamicLoad : (path: string) => Promise<any>
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit2.types b/tests/baselines/reference/importCallExpressionDeclarationEmit2.types
index cb3f9ee2de2..091fd2802f4 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit2.types
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit2.types
@@ -13,6 +13,6 @@ var p1 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit3.types b/tests/baselines/reference/importCallExpressionDeclarationEmit3.types
index 8da3750f412..22b32bd8602 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit3.types
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit3.types
@@ -19,8 +19,8 @@ import * as Zero from "./0";
 import("./0");
 >import("./0") : Promise<typeof Zero>
 >              : ^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 export var p0: Promise<typeof Zero> = import(getPath());
 >p0 : Promise<typeof Zero>
@@ -41,14 +41,14 @@ export var p1: Promise<typeof Zero> = import("./0");
 >     : ^^^^^^^^^^^
 >import("./0") : Promise<typeof Zero>
 >              : ^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 export var p2: Promise<any> = import("./0");
 >p2 : Promise<any>
 >   : ^^^^^^^^^^^^
 >import("./0") : Promise<typeof Zero>
 >              : ^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionES5AMD.types b/tests/baselines/reference/importCallExpressionES5AMD.types
index 39cea2d8c90..48f71779df7 100644
--- a/tests/baselines/reference/importCallExpressionES5AMD.types
+++ b/tests/baselines/reference/importCallExpressionES5AMD.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES5CJS.types b/tests/baselines/reference/importCallExpressionES5CJS.types
index de206c7f8d1..ce3f268a559 100644
--- a/tests/baselines/reference/importCallExpressionES5CJS.types
+++ b/tests/baselines/reference/importCallExpressionES5CJS.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES5System.types b/tests/baselines/reference/importCallExpressionES5System.types
index ea915bb38d3..5c7e4e511af 100644
--- a/tests/baselines/reference/importCallExpressionES5System.types
+++ b/tests/baselines/reference/importCallExpressionES5System.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES5UMD.types b/tests/baselines/reference/importCallExpressionES5UMD.types
index 8dcb42ad256..e08c6db4b20 100644
--- a/tests/baselines/reference/importCallExpressionES5UMD.types
+++ b/tests/baselines/reference/importCallExpressionES5UMD.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6AMD.types b/tests/baselines/reference/importCallExpressionES6AMD.types
index 979108e981a..4611ae282b9 100644
--- a/tests/baselines/reference/importCallExpressionES6AMD.types
+++ b/tests/baselines/reference/importCallExpressionES6AMD.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6CJS.types b/tests/baselines/reference/importCallExpressionES6CJS.types
index 7924ee671ef..6b9d5a041d4 100644
--- a/tests/baselines/reference/importCallExpressionES6CJS.types
+++ b/tests/baselines/reference/importCallExpressionES6CJS.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6System.types b/tests/baselines/reference/importCallExpressionES6System.types
index ffe490d1e2d..eea3381a651 100644
--- a/tests/baselines/reference/importCallExpressionES6System.types
+++ b/tests/baselines/reference/importCallExpressionES6System.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6UMD.types b/tests/baselines/reference/importCallExpressionES6UMD.types
index 43ccb0f009d..22c85a6070b 100644
--- a/tests/baselines/reference/importCallExpressionES6UMD.types
+++ b/tests/baselines/reference/importCallExpressionES6UMD.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,8 +65,8 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
 
 class C {
@@ -82,8 +82,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
 
@@ -100,7 +100,7 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionErrorInES2015.types b/tests/baselines/reference/importCallExpressionErrorInES2015.types
index 69f57a31b13..7906be1887e 100644
--- a/tests/baselines/reference/importCallExpressionErrorInES2015.types
+++ b/tests/baselines/reference/importCallExpressionErrorInES2015.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -57,6 +57,6 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionGrammarError.types b/tests/baselines/reference/importCallExpressionGrammarError.types
index 924b56169da..d615d3bcb5d 100644
--- a/tests/baselines/reference/importCallExpressionGrammarError.types
+++ b/tests/baselines/reference/importCallExpressionGrammarError.types
@@ -48,8 +48,8 @@ const p4 = import("pathToModule", "secondModule");
 >   : ^^^^^^^^^^^^
 >import("pathToModule", "secondModule") : Promise<any>
 >                                       : ^^^^^^^^^^^^
->"pathToModule" : string
->               : ^^^^^^
+>"pathToModule" : "pathToModule"
+>               : ^^^^^^^^^^^^^^
 >"secondModule" : "secondModule"
 >               : ^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInAMD1.types b/tests/baselines/reference/importCallExpressionInAMD1.types
index 7dac5e438d1..30a7ad724c4 100644
--- a/tests/baselines/reference/importCallExpressionInAMD1.types
+++ b/tests/baselines/reference/importCallExpressionInAMD1.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,6 +65,6 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.types b/tests/baselines/reference/importCallExpressionInAMD2.types
index 10aeb1747a0..940c187c061 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.types
+++ b/tests/baselines/reference/importCallExpressionInAMD2.types
@@ -60,6 +60,6 @@ foo(import("./0"));
 >    : ^ ^^            ^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInAMD3.types b/tests/baselines/reference/importCallExpressionInAMD3.types
index 881e2a6151e..3a9b3fa05d0 100644
--- a/tests/baselines/reference/importCallExpressionInAMD3.types
+++ b/tests/baselines/reference/importCallExpressionInAMD3.types
@@ -28,8 +28,8 @@ async function foo() {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 >B : typeof import("0").B
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInAMD4.types b/tests/baselines/reference/importCallExpressionInAMD4.types
index 6a994ea419b..1f5c390e64b 100644
--- a/tests/baselines/reference/importCallExpressionInAMD4.types
+++ b/tests/baselines/reference/importCallExpressionInAMD4.types
@@ -38,8 +38,8 @@ class C {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -50,8 +50,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -108,8 +108,8 @@ class C {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
@@ -140,8 +140,8 @@ export class D {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -152,8 +152,8 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -210,8 +210,8 @@ export class D {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
diff --git a/tests/baselines/reference/importCallExpressionInCJS1.types b/tests/baselines/reference/importCallExpressionInCJS1.types
index d9bf4db7aa9..93850048561 100644
--- a/tests/baselines/reference/importCallExpressionInCJS1.types
+++ b/tests/baselines/reference/importCallExpressionInCJS1.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,6 +65,6 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionInCJS2.types b/tests/baselines/reference/importCallExpressionInCJS2.types
index 5688cf6b9b3..ab0c47b6eb6 100644
--- a/tests/baselines/reference/importCallExpressionInCJS2.types
+++ b/tests/baselines/reference/importCallExpressionInCJS2.types
@@ -40,8 +40,8 @@ async function compute(promise: Promise<any>) {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
         return j.backup();
 >j.backup() : any
@@ -67,6 +67,6 @@ compute(import("./0"));
 >        : ^       ^^            ^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInCJS3.types b/tests/baselines/reference/importCallExpressionInCJS3.types
index c8d02b01cff..af654beb5e8 100644
--- a/tests/baselines/reference/importCallExpressionInCJS3.types
+++ b/tests/baselines/reference/importCallExpressionInCJS3.types
@@ -60,6 +60,6 @@ foo(import("./0"));
 >    : ^ ^^            ^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInCJS4.types b/tests/baselines/reference/importCallExpressionInCJS4.types
index d259e1c5046..0f2cc40a403 100644
--- a/tests/baselines/reference/importCallExpressionInCJS4.types
+++ b/tests/baselines/reference/importCallExpressionInCJS4.types
@@ -28,8 +28,8 @@ async function foo() {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 >B : typeof import("0").B
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInCJS5.types b/tests/baselines/reference/importCallExpressionInCJS5.types
index d28cf1e8a45..3adfbc9c051 100644
--- a/tests/baselines/reference/importCallExpressionInCJS5.types
+++ b/tests/baselines/reference/importCallExpressionInCJS5.types
@@ -38,8 +38,8 @@ class C {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -50,8 +50,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./0") : Promise<typeof import("0")>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -108,8 +108,8 @@ class C {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
@@ -140,8 +140,8 @@ export class D {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -152,8 +152,8 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -210,8 +210,8 @@ export class D {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
index 92cfca90043..fdeaef81b76 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
@@ -16,7 +16,7 @@ export = async function() {
 >                            : ^^
 >import("./something") : Promise<42>
 >                      : ^^^^^^^^^^^
->"./something" : string
->              : ^^^^^^
+>"./something" : "./something"
+>              : ^^^^^^^^^^^^^
 
 };
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsCJS.types b/tests/baselines/reference/importCallExpressionInExportEqualsCJS.types
index 932efd3d8de..c610f1dc21b 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsCJS.types
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsCJS.types
@@ -16,7 +16,7 @@ export = async function() {
 >                            : ^^
 >import("./something") : Promise<42>
 >                      : ^^^^^^^^^^^
->"./something" : string
->              : ^^^^^^
+>"./something" : "./something"
+>              : ^^^^^^^^^^^^^
 
 };
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
index 0b436d7f7a9..ef1c8337be0 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
@@ -16,7 +16,7 @@ export = async function() {
 >                            : ^^
 >import("./something") : Promise<42>
 >                      : ^^^^^^^^^^^
->"./something" : string
->              : ^^^^^^
+>"./something" : "./something"
+>              : ^^^^^^^^^^^^^
 
 };
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.types b/tests/baselines/reference/importCallExpressionInScriptContext1.types
index 874fb7f870b..22b1fd73655 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext1.types
+++ b/tests/baselines/reference/importCallExpressionInScriptContext1.types
@@ -13,8 +13,8 @@ var p1 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function arguments() { } // this is allow as the file doesn't have implicit "use strict"
 >arguments : () => void
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext2.types b/tests/baselines/reference/importCallExpressionInScriptContext2.types
index b3216162179..eb67ebe079f 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext2.types
+++ b/tests/baselines/reference/importCallExpressionInScriptContext2.types
@@ -17,8 +17,8 @@ var p1 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function arguments() { }
 >arguments : () => void
diff --git a/tests/baselines/reference/importCallExpressionInSystem1.types b/tests/baselines/reference/importCallExpressionInSystem1.types
index 84c94e2dffe..e41c50f7c1a 100644
--- a/tests/baselines/reference/importCallExpressionInSystem1.types
+++ b/tests/baselines/reference/importCallExpressionInSystem1.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,6 +65,6 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionInSystem2.types b/tests/baselines/reference/importCallExpressionInSystem2.types
index ad8fcc61086..2ffd403bec5 100644
--- a/tests/baselines/reference/importCallExpressionInSystem2.types
+++ b/tests/baselines/reference/importCallExpressionInSystem2.types
@@ -60,6 +60,6 @@ foo(import("./0"));
 >    : ^ ^^            ^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInSystem3.types b/tests/baselines/reference/importCallExpressionInSystem3.types
index 51a2b76e9f8..4d9be2c1539 100644
--- a/tests/baselines/reference/importCallExpressionInSystem3.types
+++ b/tests/baselines/reference/importCallExpressionInSystem3.types
@@ -28,8 +28,8 @@ async function foo() {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 >B : typeof import("0").B
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInSystem4.types b/tests/baselines/reference/importCallExpressionInSystem4.types
index d2e0be704db..cef7710895e 100644
--- a/tests/baselines/reference/importCallExpressionInSystem4.types
+++ b/tests/baselines/reference/importCallExpressionInSystem4.types
@@ -38,8 +38,8 @@ class C {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -50,8 +50,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -108,8 +108,8 @@ class C {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
@@ -140,8 +140,8 @@ export class D {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -152,8 +152,8 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -210,8 +210,8 @@ export class D {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
diff --git a/tests/baselines/reference/importCallExpressionInUMD1.types b/tests/baselines/reference/importCallExpressionInUMD1.types
index 4538acf4307..2cf45782d82 100644
--- a/tests/baselines/reference/importCallExpressionInUMD1.types
+++ b/tests/baselines/reference/importCallExpressionInUMD1.types
@@ -11,16 +11,16 @@ export function foo() { return "foo"; }
 import("./0");
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p1 = import("./0");
 >p1 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
@@ -53,8 +53,8 @@ export var p2 = import("./0");
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 function foo() {
 >foo : () => void
@@ -65,6 +65,6 @@ function foo() {
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.types b/tests/baselines/reference/importCallExpressionInUMD2.types
index 30435bf1ae2..55a9c46617f 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.types
+++ b/tests/baselines/reference/importCallExpressionInUMD2.types
@@ -60,6 +60,6 @@ foo(import("./0"));
 >    : ^ ^^            ^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInUMD3.types b/tests/baselines/reference/importCallExpressionInUMD3.types
index d5739d0fea0..62e8ff5424a 100644
--- a/tests/baselines/reference/importCallExpressionInUMD3.types
+++ b/tests/baselines/reference/importCallExpressionInUMD3.types
@@ -28,8 +28,8 @@ async function foo() {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 >B : typeof import("0").B
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInUMD4.types b/tests/baselines/reference/importCallExpressionInUMD4.types
index d0776a90e9c..4cb77bf0414 100644
--- a/tests/baselines/reference/importCallExpressionInUMD4.types
+++ b/tests/baselines/reference/importCallExpressionInUMD4.types
@@ -38,8 +38,8 @@ class C {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -50,8 +50,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -108,8 +108,8 @@ class C {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
@@ -140,8 +140,8 @@ export class D {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -152,8 +152,8 @@ export class D {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -210,8 +210,8 @@ export class D {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.types b/tests/baselines/reference/importCallExpressionNestedAMD.types
index 1f9ab306161..b6d446cf465 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.types b/tests/baselines/reference/importCallExpressionNestedAMD2.types
index 20878ced9f4..7d66061c112 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS.types b/tests/baselines/reference/importCallExpressionNestedCJS.types
index 228b38071bc..7d918cf8b9d 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS.types
+++ b/tests/baselines/reference/importCallExpressionNestedCJS.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS2.types b/tests/baselines/reference/importCallExpressionNestedCJS2.types
index 7bbd84af135..fc8a20cdd5b 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS2.types
+++ b/tests/baselines/reference/importCallExpressionNestedCJS2.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedES2015.types b/tests/baselines/reference/importCallExpressionNestedES2015.types
index 105f43cae64..bced33f2007 100644
--- a/tests/baselines/reference/importCallExpressionNestedES2015.types
+++ b/tests/baselines/reference/importCallExpressionNestedES2015.types
@@ -22,8 +22,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedES20152.types b/tests/baselines/reference/importCallExpressionNestedES20152.types
index cc9f77e94a9..0b741883dac 100644
--- a/tests/baselines/reference/importCallExpressionNestedES20152.types
+++ b/tests/baselines/reference/importCallExpressionNestedES20152.types
@@ -22,8 +22,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedES2020.types b/tests/baselines/reference/importCallExpressionNestedES2020.types
index d7faa43bb45..c0036a11266 100644
--- a/tests/baselines/reference/importCallExpressionNestedES2020.types
+++ b/tests/baselines/reference/importCallExpressionNestedES2020.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedES20202.types b/tests/baselines/reference/importCallExpressionNestedES20202.types
index 0032d04772e..fab1134dde4 100644
--- a/tests/baselines/reference/importCallExpressionNestedES20202.types
+++ b/tests/baselines/reference/importCallExpressionNestedES20202.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem.types b/tests/baselines/reference/importCallExpressionNestedSystem.types
index 8dcd22bcd55..016d56fbe7d 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem2.types b/tests/baselines/reference/importCallExpressionNestedSystem2.types
index e45356e9557..b6112d640a3 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem2.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem2.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.types b/tests/baselines/reference/importCallExpressionNestedUMD.types
index 513b424c31f..a4bcb595521 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.types b/tests/baselines/reference/importCallExpressionNestedUMD2.types
index 51cd975b50c..c4cbc3ebb08 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.types
@@ -21,8 +21,8 @@ async function foo() {
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<typeof import("foo")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >default : "./foo"
 >        : ^^^^^^^
 }
diff --git a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
index 304c5e93ad9..ad7279528d5 100644
--- a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
+++ b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
@@ -39,8 +39,8 @@ class C {
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
     method() {
 >method : () => void
@@ -51,8 +51,8 @@ class C {
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./0") : Promise<typeof import("0")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
@@ -115,8 +115,8 @@ class C {
 >                    : ^^^^^^^^^^^^^^^^^^
 >import("./1") : Promise<typeof import("1")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./1" : string
->      : ^^^^^^
+>"./1" : "./1"
+>      : ^^^^^
 
             console.log(one.backup());
 >console.log(one.backup()) : any
diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
index fa1395f6111..2cd909131f9 100644
--- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
+++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
@@ -53,16 +53,16 @@ var p1 = import(ValidSomeCondition() ? "./0" : "externalModule");
 >   : ^^^^^^^^^^^^
 >import(ValidSomeCondition() ? "./0" : "externalModule") : Promise<any>
 >                                                        : ^^^^^^^^^^^^
->ValidSomeCondition() ? "./0" : "externalModule" : string
->                                                : ^^^^^^
+>ValidSomeCondition() ? "./0" : "externalModule" : "./0" | "externalModule"
+>                                                : ^^^^^^^^^^^^^^^^^^^^^^^^
 >ValidSomeCondition() : boolean
 >                     : ^^^^^^^
 >ValidSomeCondition : () => boolean
 >                   : ^^^^^^       
->"./0" : string
->      : ^^^^^^
->"externalModule" : string
->                 : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
+>"externalModule" : "externalModule"
+>                 : ^^^^^^^^^^^^^^^^
 
 var p1: Promise<any> = import(getSpecifier());
 >p1 : Promise<any>
@@ -101,8 +101,8 @@ const p2 = import(whatToLoad ? getSpecifier() : "defaulPath") as Promise<typeof
 >               : ^^^^^^
 >getSpecifier : () => string
 >             : ^^^^^^      
->"defaulPath" : string
->             : ^^^^^^
+>"defaulPath" : "defaulPath"
+>             : ^^^^^^^^^^^^
 >defaultModule : typeof defaultModule
 >              : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt
index 2693cbd27ba..4639bc9ef1e 100644
--- a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt
+++ b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt
@@ -1,6 +1,6 @@
 importCallExpressionSpecifierNotStringTypeError.ts(5,8): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'.
 importCallExpressionSpecifierNotStringTypeError.ts(6,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'.
-importCallExpressionSpecifierNotStringTypeError.ts(7,19): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string | boolean'.
+importCallExpressionSpecifierNotStringTypeError.ts(7,19): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean | "defaulPath"'.
 importCallExpressionSpecifierNotStringTypeError.ts(12,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string[]'.
 importCallExpressionSpecifierNotStringTypeError.ts(13,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type '() => string'.
 
@@ -18,7 +18,7 @@ importCallExpressionSpecifierNotStringTypeError.ts(13,17): error TS7036: Dynamic
 !!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'.
     const p2 = import(whatToLoad ? getSpecifier() : "defaulPath")
                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string | boolean'.
+!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean | "defaulPath"'.
     p1.then(zero => {
         return zero.foo();  // ok, zero is any
     });
diff --git a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.types b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.types
index cd6876a0ce1..0fe8ed18407 100644
--- a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.types
+++ b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.types
@@ -33,16 +33,16 @@ const p2 = import(whatToLoad ? getSpecifier() : "defaulPath")
 >   : ^^^^^^^^^^^^
 >import(whatToLoad ? getSpecifier() : "defaulPath") : Promise<any>
 >                                                   : ^^^^^^^^^^^^
->whatToLoad ? getSpecifier() : "defaulPath" : string | boolean
->                                           : ^^^^^^^^^^^^^^^^
+>whatToLoad ? getSpecifier() : "defaulPath" : boolean | "defaulPath"
+>                                           : ^^^^^^^^^^^^^^^^^^^^^^
 >whatToLoad : boolean
 >           : ^^^^^^^
 >getSpecifier() : boolean
 >               : ^^^^^^^
 >getSpecifier : () => boolean
 >             : ^^^^^^       
->"defaulPath" : string
->             : ^^^^^^
+>"defaulPath" : "defaulPath"
+>             : ^^^^^^^^^^^^
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();  // ok, zero is any}) : Promise<any>
@@ -77,10 +77,10 @@ var p3 = import(["path1", "path2"]);
 >                           : ^^^^^^^^^^^^
 >["path1", "path2"] : string[]
 >                   : ^^^^^^^^
->"path1" : string
->        : ^^^^^^
->"path2" : string
->        : ^^^^^^
+>"path1" : "path1"
+>        : ^^^^^^^
+>"path2" : "path2"
+>        : ^^^^^^^
 
 var p4 = import(()=>"PathToModule");
 >p4 : Promise<any>
diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.types b/tests/baselines/reference/importCallExpressionWithTypeArgument.types
index 849c963a530..2214a79bccb 100644
--- a/tests/baselines/reference/importCallExpressionWithTypeArgument.types
+++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.types
@@ -17,14 +17,14 @@ var p1 = import<Promise<any>>("./0");  // error
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import<Promise<any>>("./0") : Promise<typeof import("0")>
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
 var p2 = import<>("./0");  // error
 >p2 : Promise<typeof import("0")>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import<>("./0") : Promise<typeof import("0")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./0" : string
->      : ^^^^^^
+>"./0" : "./0"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/importClause_default.types b/tests/baselines/reference/importClause_default.types
index 09cda4dd663..576ea51ad7d 100644
--- a/tests/baselines/reference/importClause_default.types
+++ b/tests/baselines/reference/importClause_default.types
@@ -25,8 +25,8 @@ let a: A = { a: '' };
 >          : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 let b = { A };
 >b : { A: typeof A; }
diff --git a/tests/baselines/reference/importClause_namespaceImport.types b/tests/baselines/reference/importClause_namespaceImport.types
index 43c7ffcb9ec..029ce9a4539 100644
--- a/tests/baselines/reference/importClause_namespaceImport.types
+++ b/tests/baselines/reference/importClause_namespaceImport.types
@@ -67,8 +67,8 @@ const c: types.C<string> = "";
 >  : ^^^^^^
 >types : any
 >      : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 const d = { types };
 >d : { types: typeof types; }
diff --git a/tests/baselines/reference/importHelpersES6.types b/tests/baselines/reference/importHelpersES6.types
index 92dfa8a53f4..918648cdbd0 100644
--- a/tests/baselines/reference/importHelpersES6.types
+++ b/tests/baselines/reference/importHelpersES6.types
@@ -12,8 +12,8 @@ declare var dec: any;
     #x: number = 1;
 >#x : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     async f() { this.#x = await this.#x; }
 >f : () => Promise<void>
diff --git a/tests/baselines/reference/importInTypePosition.types b/tests/baselines/reference/importInTypePosition.types
index 1005b797d52..91b04b343f2 100644
--- a/tests/baselines/reference/importInTypePosition.types
+++ b/tests/baselines/reference/importInTypePosition.types
@@ -22,10 +22,10 @@ module A {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 }
 
 // no code gen expected
diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types
index 3c912f3a383..5dd8a5af3e1 100644
--- a/tests/baselines/reference/importStatements.types
+++ b/tests/baselines/reference/importStatements.types
@@ -23,10 +23,10 @@ module A {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 }
 
 // no code gen expected
@@ -98,10 +98,10 @@ module D {
 >  : ^^^^^^^^
 >Point : typeof a.Point
 >      : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 }
 
 module E {
diff --git a/tests/baselines/reference/importTsBeforeDTs.types b/tests/baselines/reference/importTsBeforeDTs.types
index 5bc8793b660..d491d4701c9 100644
--- a/tests/baselines/reference/importTsBeforeDTs.types
+++ b/tests/baselines/reference/importTsBeforeDTs.types
@@ -37,7 +37,7 @@ var z2 = foo.y + 10; // Should resolve
 export var y: number = 42;
 >y : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 
diff --git a/tests/baselines/reference/importTypeAmbient.types b/tests/baselines/reference/importTypeAmbient.types
index 2931b2bec51..e42b17d333c 100644
--- a/tests/baselines/reference/importTypeAmbient.types
+++ b/tests/baselines/reference/importTypeAmbient.types
@@ -25,12 +25,12 @@ const x: import("foo") = { x: 0, y: 0 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 declare module "foo2" {
 >"foo2" : typeof import("foo2")
@@ -87,12 +87,12 @@ let y: import("foo2").Bar.I = { a: "", b: 0 };
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 class Bar2 {
 >Bar2 : Bar2
diff --git a/tests/baselines/reference/importTypeGenericTypes.types b/tests/baselines/reference/importTypeGenericTypes.types
index 26624161b3c..db2338e7d72 100644
--- a/tests/baselines/reference/importTypeGenericTypes.types
+++ b/tests/baselines/reference/importTypeGenericTypes.types
@@ -81,20 +81,20 @@ export const x: import("./foo")<{x: number}> = { x: 0, y: 0, data: {x: 12} };
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >data : { x: number; }
 >     : ^^^^^^^^^^^^^^
 >{x: 12} : { x: number; }
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 export let y: import("./foo2").Bar.I<{x: number}> = { a: "", b: 0, data: {x: 12} };
 >y : import("foo2").Bar.I<{ x: number; }>
@@ -107,20 +107,20 @@ export let y: import("./foo2").Bar.I<{x: number}> = { a: "", b: 0, data: {x: 12}
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >data : { x: number; }
 >     : ^^^^^^^^^^^^^^
 >{x: 12} : { x: number; }
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 export class Bar2<T> {
 >Bar2 : Bar2<T>
diff --git a/tests/baselines/reference/importTypeLocal.types b/tests/baselines/reference/importTypeLocal.types
index 3fe83c18023..1b4e783b1d1 100644
--- a/tests/baselines/reference/importTypeLocal.types
+++ b/tests/baselines/reference/importTypeLocal.types
@@ -67,12 +67,12 @@ export const x: import("./foo") = { x: 0, y: 0 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export let y: import("./foo2").Bar.I = { a: "", b: 0 };
 >y : import("foo2").Bar.I
@@ -83,12 +83,12 @@ export let y: import("./foo2").Bar.I = { a: "", b: 0 };
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export class Bar2 {
 >Bar2 : Bar2
diff --git a/tests/baselines/reference/import_reference-exported-alias.types b/tests/baselines/reference/import_reference-exported-alias.types
index 44c076cc817..d2d317989b7 100644
--- a/tests/baselines/reference/import_reference-exported-alias.types
+++ b/tests/baselines/reference/import_reference-exported-alias.types
@@ -53,8 +53,8 @@ module App {
 >            : ^^^^^^      
 
                 return "Bill Gates";
->"Bill Gates" : string
->             : ^^^^^^
+>"Bill Gates" : "Bill Gates"
+>             : ^^^^^^^^^^^^
             }
         }
     }
diff --git a/tests/baselines/reference/import_reference-to-type-alias.types b/tests/baselines/reference/import_reference-to-type-alias.types
index e00f33fffbc..0ee619113d5 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.types
+++ b/tests/baselines/reference/import_reference-to-type-alias.types
@@ -51,8 +51,8 @@ export module App {
 >            : ^^^^^^      
 
                 return "Bill Gates";
->"Bill Gates" : string
->             : ^^^^^^
+>"Bill Gates" : "Bill Gates"
+>             : ^^^^^^^^^^^^
             }
         }
     }
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.types b/tests/baselines/reference/importsImplicitlyReadonly.types
index b807a998232..3b4a6f5f432 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.types
+++ b/tests/baselines/reference/importsImplicitlyReadonly.types
@@ -62,52 +62,52 @@ a1.y = 1;  // Error
 >  : ^
 
 a2.x = 1;
->a2.x = 1 : number
->         : ^^^^^^
+>a2.x = 1 : 1
+>         : ^
 >a2.x : number
 >     : ^^^^^^
 >a2 : typeof a1
 >   : ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a2.y = 1;
->a2.y = 1 : number
->         : ^^^^^^
+>a2.y = 1 : 1
+>         : ^
 >a2.y : number
 >     : ^^^^^^
 >a2 : typeof a1
 >   : ^^^^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a3.x = 1;
->a3.x = 1 : number
->         : ^^^^^^
+>a3.x = 1 : 1
+>         : ^
 >a3.x : number
 >     : ^^^^^^
 >a3 : typeof a1
 >   : ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a3.y = 1;
->a3.y = 1 : number
->         : ^^^^^^
+>a3.y = 1 : 1
+>         : ^
 >a3.y : number
 >     : ^^^^^^
 >a3 : typeof a1
 >   : ^^^^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 === a.ts ===
 export var x = 1;
diff --git a/tests/baselines/reference/inKeywordTypeguard(strict=false).types b/tests/baselines/reference/inKeywordTypeguard(strict=false).types
index 9d1cc0e41a4..eaf32e71c8c 100644
--- a/tests/baselines/reference/inKeywordTypeguard(strict=false).types
+++ b/tests/baselines/reference/inKeywordTypeguard(strict=false).types
@@ -122,16 +122,16 @@ function positiveTestClassesWithOptionalProperties(x: AWithOptionalProp | BWithO
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         x.a = "1";
->x.a = "1" : string
->          : ^^^^^^
+>x.a = "1" : "1"
+>          : ^^^
 >x.a : string
 >    : ^^^^^^
 >x : AWithOptionalProp
 >  : ^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
     } else {
         x.b = "1";
@@ -155,8 +155,8 @@ class AWithMethod {
     a(): string { return ""; }
 >a : () => string
 >  : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class BWithMethod {
@@ -166,8 +166,8 @@ class BWithMethod {
     b(): string { return ""; }
 >b : () => string
 >  : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function negativeTestClassesWithMembers(x: AWithMethod | BWithMethod) {
diff --git a/tests/baselines/reference/inKeywordTypeguard(strict=true).types b/tests/baselines/reference/inKeywordTypeguard(strict=true).types
index ffd91ecad9b..118e1c698a6 100644
--- a/tests/baselines/reference/inKeywordTypeguard(strict=true).types
+++ b/tests/baselines/reference/inKeywordTypeguard(strict=true).types
@@ -125,16 +125,16 @@ function positiveTestClassesWithOptionalProperties(x: AWithOptionalProp | BWithO
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         x.a = "1";
->x.a = "1" : string
->          : ^^^^^^
+>x.a = "1" : "1"
+>          : ^^^
 >x.a : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
 >x : AWithOptionalProp
 >  : ^^^^^^^^^^^^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
     } else {
         x.b = "1";
@@ -158,8 +158,8 @@ class AWithMethod {
     a(): string { return ""; }
 >a : () => string
 >  : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class BWithMethod {
@@ -169,8 +169,8 @@ class BWithMethod {
     b(): string { return ""; }
 >b : () => string
 >  : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function negativeTestClassesWithMembers(x: AWithMethod | BWithMethod) {
diff --git a/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types b/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types
index d6fbcd9ca59..22ad927669c 100644
--- a/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types
+++ b/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types
@@ -28,8 +28,8 @@ const fn = <
 >(opts:Opts<A, B>):string => 'Z'
 >opts : Opts<A, B>
 >     : ^^^^^^^^^^
->'Z' : string
->    : ^^^^^^
+>'Z' : "Z"
+>    : ^^^
 
 interface MyObjA {
   x:string,
@@ -52,8 +52,8 @@ fn<MyObjA>({
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'X' : string
->    : ^^^^^^
+>'X' : "X"
+>    : ^^^
 >y : string
 >  : ^^^^^^
 >'Y' : "Y"
diff --git a/tests/baselines/reference/incrementOnNullAssertion.types b/tests/baselines/reference/incrementOnNullAssertion.types
index 31f46c6a8cc..f46393c7553 100644
--- a/tests/baselines/reference/incrementOnNullAssertion.types
+++ b/tests/baselines/reference/incrementOnNullAssertion.types
@@ -31,16 +31,16 @@ if (foo[x] === undefined) {
 >          : ^^^^^^^^^
 
     foo[x] = 1
->foo[x] = 1 : number
->           : ^^^^^^
+>foo[x] = 1 : 1
+>           : ^
 >foo[x] : number | undefined
 >       : ^^^^^^^^^^^^^^^^^^
 >foo : Dictionary<number>
 >    : ^^^^^^^^^^^^^^^^^^
 >x : "bar"
 >  : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 else {
     let nu = foo[x]
diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.types b/tests/baselines/reference/incrementOperatorWithNumberType.types
index a228fbff345..0adfbb7fb9d 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberType.types
+++ b/tests/baselines/reference/incrementOperatorWithNumberType.types
@@ -11,10 +11,10 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types
index 4933c205b3f..299a8e780b0 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types
+++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types
index 0bd116c42ea..c5396240487 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", ""];
 >        : ^^^^^^^^
 >["", ""] : string[]
 >         : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
 function foo(): string { return ""; }
 >foo : () => string
 >    : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/indexAt(target=es2022).types b/tests/baselines/reference/indexAt(target=es2022).types
index fab656266d9..2201919b206 100644
--- a/tests/baselines/reference/indexAt(target=es2022).types
+++ b/tests/baselines/reference/indexAt(target=es2022).types
@@ -12,8 +12,8 @@
 >  : ^
 >at : (index: number) => number
 >   : ^     ^^      ^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 "foo".at(0);
 >"foo".at(0) : string
@@ -24,8 +24,8 @@
 >      : ^^^^^
 >at : (index: number) => string | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Int8Array().at(0);
 >new Int8Array().at(0) : number
@@ -38,8 +38,8 @@ new Int8Array().at(0);
 >          : ^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint8Array().at(0);
 >new Uint8Array().at(0) : number
@@ -52,8 +52,8 @@ new Uint8Array().at(0);
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint8ClampedArray().at(0);
 >new Uint8ClampedArray().at(0) : number
@@ -66,8 +66,8 @@ new Uint8ClampedArray().at(0);
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Int16Array().at(0);
 >new Int16Array().at(0) : number
@@ -80,8 +80,8 @@ new Int16Array().at(0);
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint16Array().at(0);
 >new Uint16Array().at(0) : number
@@ -94,8 +94,8 @@ new Uint16Array().at(0);
 >            : ^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Int32Array().at(0);
 >new Int32Array().at(0) : number
@@ -108,8 +108,8 @@ new Int32Array().at(0);
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint32Array().at(0);
 >new Uint32Array().at(0) : number
@@ -122,8 +122,8 @@ new Uint32Array().at(0);
 >            : ^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Float32Array().at(0);
 >new Float32Array().at(0) : number
@@ -136,8 +136,8 @@ new Float32Array().at(0);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Float64Array().at(0);
 >new Float64Array().at(0) : number
@@ -150,8 +150,8 @@ new Float64Array().at(0);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new BigInt64Array().at(0);
 >new BigInt64Array().at(0) : bigint
@@ -164,8 +164,8 @@ new BigInt64Array().at(0);
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => bigint | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new BigUint64Array().at(0);
 >new BigUint64Array().at(0) : bigint
@@ -178,6 +178,6 @@ new BigUint64Array().at(0);
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => bigint | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/indexAt(target=esnext).types b/tests/baselines/reference/indexAt(target=esnext).types
index fab656266d9..2201919b206 100644
--- a/tests/baselines/reference/indexAt(target=esnext).types
+++ b/tests/baselines/reference/indexAt(target=esnext).types
@@ -12,8 +12,8 @@
 >  : ^
 >at : (index: number) => number
 >   : ^     ^^      ^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 "foo".at(0);
 >"foo".at(0) : string
@@ -24,8 +24,8 @@
 >      : ^^^^^
 >at : (index: number) => string | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Int8Array().at(0);
 >new Int8Array().at(0) : number
@@ -38,8 +38,8 @@ new Int8Array().at(0);
 >          : ^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint8Array().at(0);
 >new Uint8Array().at(0) : number
@@ -52,8 +52,8 @@ new Uint8Array().at(0);
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint8ClampedArray().at(0);
 >new Uint8ClampedArray().at(0) : number
@@ -66,8 +66,8 @@ new Uint8ClampedArray().at(0);
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Int16Array().at(0);
 >new Int16Array().at(0) : number
@@ -80,8 +80,8 @@ new Int16Array().at(0);
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint16Array().at(0);
 >new Uint16Array().at(0) : number
@@ -94,8 +94,8 @@ new Uint16Array().at(0);
 >            : ^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Int32Array().at(0);
 >new Int32Array().at(0) : number
@@ -108,8 +108,8 @@ new Int32Array().at(0);
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Uint32Array().at(0);
 >new Uint32Array().at(0) : number
@@ -122,8 +122,8 @@ new Uint32Array().at(0);
 >            : ^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Float32Array().at(0);
 >new Float32Array().at(0) : number
@@ -136,8 +136,8 @@ new Float32Array().at(0);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new Float64Array().at(0);
 >new Float64Array().at(0) : number
@@ -150,8 +150,8 @@ new Float64Array().at(0);
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => number | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new BigInt64Array().at(0);
 >new BigInt64Array().at(0) : bigint
@@ -164,8 +164,8 @@ new BigInt64Array().at(0);
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => bigint | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new BigUint64Array().at(0);
 >new BigUint64Array().at(0) : bigint
@@ -178,6 +178,6 @@ new BigUint64Array().at(0);
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >at : (index: number) => bigint | undefined
 >   : ^     ^^      ^^^^^                  
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/indexIntoArraySubclass.types b/tests/baselines/reference/indexIntoArraySubclass.types
index b31327b4081..f3c44ec0df7 100644
--- a/tests/baselines/reference/indexIntoArraySubclass.types
+++ b/tests/baselines/reference/indexIntoArraySubclass.types
@@ -17,10 +17,10 @@ var r = x2[0]; // string
 >  : ^
 
 r = 0; //error
->r = 0 : number
->      : ^^^^^^
+>r = 0 : 0
+>      : ^
 >r : string
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/indexSignatureWithInitializer1.types b/tests/baselines/reference/indexSignatureWithInitializer1.types
index cff8d605d97..bc0c53e4848 100644
--- a/tests/baselines/reference/indexSignatureWithInitializer1.types
+++ b/tests/baselines/reference/indexSignatureWithInitializer1.types
@@ -8,6 +8,6 @@ class C {
   [a: number = 1]: number;
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/indexSignatures1.types b/tests/baselines/reference/indexSignatures1.types
index 64b38e43c9f..f33d4ebdf16 100644
--- a/tests/baselines/reference/indexSignatures1.types
+++ b/tests/baselines/reference/indexSignatures1.types
@@ -269,8 +269,8 @@ dom = { data123: 'hello' };
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >data123 : string
 >        : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 dom = { date123: 'hello' };  // Error
 >dom = { date123: 'hello' } : { date123: string; }
@@ -1196,8 +1196,8 @@ const system = Symbol('system');
 >                 : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'system' : string
->         : ^^^^^^
+>'system' : "system"
+>         : ^^^^^^^^
 
 const SomeSytePlugin = Symbol('SomeSytePlugin');
 >SomeSytePlugin : unique symbol
@@ -1206,8 +1206,8 @@ const SomeSytePlugin = Symbol('SomeSytePlugin');
 >                         : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'SomeSytePlugin' : string
->                 : ^^^^^^
+>'SomeSytePlugin' : "SomeSytePlugin"
+>                 : ^^^^^^^^^^^^^^^^
 
 interface Plugs {
     [key: symbol]: (...args: any) => unknown;
@@ -1290,8 +1290,8 @@ var theAnswer: symbol = Symbol('secret');
 >                 : ^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'secret' : string
->         : ^^^^^^
+>'secret' : "secret"
+>         : ^^^^^^^^
 
 var obj = {} as Record<symbol, number>;
 >obj : Record<symbol, number>
@@ -1302,16 +1302,16 @@ var obj = {} as Record<symbol, number>;
 >   : ^^
 
 obj[theAnswer] = 42;
->obj[theAnswer] = 42 : number
->                    : ^^^^^^
+>obj[theAnswer] = 42 : 42
+>                    : ^^
 >obj[theAnswer] : number
 >               : ^^^^^^
 >obj : Record<symbol, number>
 >    : ^^^^^^^^^^^^^^^^^^^^^^
 >theAnswer : symbol
 >          : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 // Repro from #26470
 
@@ -1322,8 +1322,8 @@ const directive = Symbol('directive');
 >                    : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'directive' : string
->            : ^^^^^^
+>'directive' : "directive"
+>            : ^^^^^^^^^^^
 
 declare function foo<TArg, TRet, TDir>(options: { [x in string]: (arg: TArg) => TRet } & { [directive]?: TDir }): void;
 >foo : <TArg, TRet, TDir>(options: { [x in string]: (arg: TArg) => TRet; } & { [directive]?: TDir; }) => void
@@ -1456,8 +1456,8 @@ let case3 = foo({
 >            : ^^^^^^
 >directive : unique symbol
 >          : ^^^^^^^^^^^^^
->'str' : string
->      : ^^^^^^
+>'str' : "str"
+>      : ^^^^^
 
     addOne: (x: number) => x + 1,
 >addOne : (x: number) => number
@@ -1570,7 +1570,7 @@ const a: A = { [id]: 'test' }
 >     : ^^^^^^
 >id : `${number}-${number}-${number}-${number}`
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 let aid = a[id];
@@ -1608,8 +1608,8 @@ const aa: AA = { [sym]: '123' };
 >      : ^^^^^^
 >sym : unique symbol
 >    : ^^^^^^^^^^^^^
->'123' : string
->      : ^^^^^^
+>'123' : "123"
+>      : ^^^^^
 
 const obj1: { [key: symbol]: string } = { [sym]: 'hello '};
 >obj1 : { [key: symbol]: string; }
@@ -1622,8 +1622,8 @@ const obj1: { [key: symbol]: string } = { [sym]: 'hello '};
 >      : ^^^^^^
 >sym : unique symbol
 >    : ^^^^^^^^^^^^^
->'hello ' : string
->         : ^^^^^^
+>'hello ' : "hello "
+>         : ^^^^^^^^
 
 const obj2: { [key: string]: string } = { [sym]: 'hello '};  // Permitted for backwards compatibility
 >obj2 : { [key: string]: string; }
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index f0143ddbaf4..7fabdd84f72 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -32,12 +32,12 @@ var x1 = foo({ 0: 0, 1: 1 });       // type should be number
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >1 : number
 >  : ^^^^^^
+>1 : 1
+>  : ^
 
 var x2 = bar({ 0: 0, 1: 1 });
 >x2 : number
@@ -50,12 +50,12 @@ var x2 = bar({ 0: 0, 1: 1 });
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >1 : number
 >  : ^^^^^^
+>1 : 1
+>  : ^
 
 var x3 = bar({ zero: 0, one: 1 });  // type should be number
 >x3 : number
@@ -68,10 +68,10 @@ var x3 = bar({ zero: 0, one: 1 });  // type should be number
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >zero : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/indexedAccessConstraints.types b/tests/baselines/reference/indexedAccessConstraints.types
index 7f90e3f2672..cf4424a0468 100644
--- a/tests/baselines/reference/indexedAccessConstraints.types
+++ b/tests/baselines/reference/indexedAccessConstraints.types
@@ -45,8 +45,8 @@ export function methodFnLength<T extends {}, K extends keyof T>(obj: T, methodKe
 >           : ^^^^^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
     return fn.length;
 >fn.length : number
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
index 02e83245017..6998790544f 100644
--- a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
+++ b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
@@ -38,6 +38,6 @@ export const o: O = { b: '' }
 >          : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/indexedAccessWithFreshObjectLiteral.types b/tests/baselines/reference/indexedAccessWithFreshObjectLiteral.types
index 180f276e9e2..c483b23f65f 100644
--- a/tests/baselines/reference/indexedAccessWithFreshObjectLiteral.types
+++ b/tests/baselines/reference/indexedAccessWithFreshObjectLiteral.types
@@ -195,14 +195,14 @@ function corge(id: string) {
       a: 123,
 >a : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
       b: ""
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   } as Record<string, number | string>)[id]
 >id : string
@@ -228,14 +228,14 @@ function grault(id: string) {
       a: 123,
 >a : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
       b: ""
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   } as { [k: string]: string | number})[id]
 >k : string
diff --git a/tests/baselines/reference/indexer.types b/tests/baselines/reference/indexer.types
index fbf5a808d28..24e58a429cf 100644
--- a/tests/baselines/reference/indexer.types
+++ b/tests/baselines/reference/indexer.types
@@ -24,16 +24,16 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >             : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 >1 : { id: string; }
 >  : ^^^^^^^^^^^^^^^
 >{ id : "b" } : { id: string; }
 >             : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 jq[0].id;
 >jq[0].id : string
diff --git a/tests/baselines/reference/indexerA.types b/tests/baselines/reference/indexerA.types
index 2968802262c..1185dfc4ce1 100644
--- a/tests/baselines/reference/indexerA.types
+++ b/tests/baselines/reference/indexerA.types
@@ -30,16 +30,16 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >             : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 >1 : { id: string; }
 >  : ^^^^^^^^^^^^^^^
 >{ id : "b" } : { id: string; }
 >             : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 jq[0].id;
 >jq[0].id : string
diff --git a/tests/baselines/reference/indexerWithTuple.types b/tests/baselines/reference/indexerWithTuple.types
index 9b0f6989d23..3e8ff9641b7 100644
--- a/tests/baselines/reference/indexerWithTuple.types
+++ b/tests/baselines/reference/indexerWithTuple.types
@@ -6,34 +6,34 @@ var strNumTuple: [string, number] = ["foo", 10];
 >            : ^^^^^^^^^^^^^^^^
 >["foo", 10] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->10 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>10 : 10
+>   : ^^
 
 var numTupleTuple: [number, [string, number]] = [10, ["bar", 20]];
 >numTupleTuple : [number, [string, number]]
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[10, ["bar", 20]] : [number, [string, number]]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >["bar", 20] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
->20 : number
->   : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
+>20 : 20
+>   : ^^
 
 var unionTuple1: [number, string| number] = [10, "foo"];
 >unionTuple1 : [number, string | number]
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[10, "foo"] : [number, string]
 >            : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>10 : 10
+>   : ^^
+>"foo" : "foo"
+>      : ^^^^^
 
 var unionTuple2: [boolean, string| number] = [true, "foo"];
 >unionTuple2 : [boolean, string | number]
@@ -42,8 +42,8 @@ var unionTuple2: [boolean, string| number] = [true, "foo"];
 >              : ^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 // no error
 var idx0 = 0;
diff --git a/tests/baselines/reference/indexingTypesWithNever.types b/tests/baselines/reference/indexingTypesWithNever.types
index 03d122e0116..2ee4cf8e349 100644
--- a/tests/baselines/reference/indexingTypesWithNever.types
+++ b/tests/baselines/reference/indexingTypesWithNever.types
@@ -47,12 +47,12 @@ const result3 = genericFn1({ c: "ctest", d: "dtest" });
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >c : string
 >  : ^^^^^^
->"ctest" : string
->        : ^^^^^^
+>"ctest" : "ctest"
+>        : ^^^^^^^
 >d : string
 >  : ^^^^^^
->"dtest" : string
->        : ^^^^^^
+>"dtest" : "dtest"
+>        : ^^^^^^^
 
 declare function genericFn2<T extends { [ind: string]: string }>(
 >genericFn2 : <T extends { [ind: string]: string; }>(obj: T) => T[never]
@@ -78,12 +78,12 @@ const result4 = genericFn2({ e: "etest", f: "ftest" });
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >e : string
 >  : ^^^^^^
->"etest" : string
->        : ^^^^^^
+>"etest" : "etest"
+>        : ^^^^^^^
 >f : string
 >  : ^^^^^^
->"ftest" : string
->        : ^^^^^^
+>"ftest" : "ftest"
+>        : ^^^^^^^
 
 declare function genericFn3<
 >genericFn3 : <T extends { [K in keyof T]: T[K]; }, U extends keyof T, V extends keyof T>(obj: T, u: U, v: V) => T[U & V]
@@ -112,12 +112,12 @@ const result5 = genericFn3({ g: "gtest", h: "htest" }, "g", "h"); // 'g' & 'h' w
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >g : string
 >  : ^^^^^^
->"gtest" : string
->        : ^^^^^^
+>"gtest" : "gtest"
+>        : ^^^^^^^
 >h : string
 >  : ^^^^^^
->"htest" : string
->        : ^^^^^^
+>"htest" : "htest"
+>        : ^^^^^^^
 >"g" : "g"
 >    : ^^^
 >"h" : "h"
diff --git a/tests/baselines/reference/indirectDiscriminantAndExcessProperty.types b/tests/baselines/reference/indirectDiscriminantAndExcessProperty.types
index 2e90d00ca9d..219b6414f94 100644
--- a/tests/baselines/reference/indirectDiscriminantAndExcessProperty.types
+++ b/tests/baselines/reference/indirectDiscriminantAndExcessProperty.types
@@ -48,8 +48,8 @@ thing({
     abc: "hello!"
 >abc : string
 >    : ^^^^^^
->"hello!" : string
->         : ^^^^^^
+>"hello!" : "hello!"
+>         : ^^^^^^^^
 
 });
 
@@ -76,8 +76,8 @@ thing({
     abc: "hello!",
 >abc : string
 >    : ^^^^^^
->"hello!" : string
->         : ^^^^^^
+>"hello!" : "hello!"
+>         : ^^^^^^^^
 
     extra: 123,
 >extra : number
@@ -110,8 +110,8 @@ thing({
     xyz: 123,
 >xyz : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     extra: 123,
 >extra : number
diff --git a/tests/baselines/reference/indirectTypeParameterReferences.types b/tests/baselines/reference/indirectTypeParameterReferences.types
index 839c0d79b8a..b4165f151e9 100644
--- a/tests/baselines/reference/indirectTypeParameterReferences.types
+++ b/tests/baselines/reference/indirectTypeParameterReferences.types
@@ -65,8 +65,8 @@ const {combined, literal} = flowtypes<{a: string}>({b: 'b-value'})
 >               : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'b-value' : string
->          : ^^^^^^
+>'b-value' : "b-value"
+>          : ^^^^^^^^^
 
 literal(aPlusB => {
 >literal(aPlusB => {  aPlusB.b  aPlusB.a}) : any
@@ -143,8 +143,8 @@ let n: number = f(2).a;
 >     : ^^^^^^^^^^^^^^
 >f : <T>(a: T) => { a: typeof a; }
 >  : ^ ^^ ^^ ^^^^^                
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >a : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types b/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types
index f9c2bb1e61a..b8a1afe03d6 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types
@@ -302,8 +302,8 @@ testSet.add(1);
 >        : ^^^^^^^^^^^^^
 >add : (a: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 testSet.add(2);
 >testSet.add(2) : void
@@ -314,8 +314,8 @@ testSet.add(2);
 >        : ^^^^^^^^^^^^^
 >add : (a: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 testSet.add(3);
 >testSet.add(3) : void
@@ -326,8 +326,8 @@ testSet.add(3);
 >        : ^^^^^^^^^^^^^
 >add : (a: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 testSet.transform(
 >testSet.transform(  compose(    filter(x => x % 1 === 0),    map(x => x + x),    map(x => x + '!!!'),    map(x => x.toUpperCase())  )) : SetOf<string>
@@ -479,8 +479,8 @@ testSet.transform(
 >         : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     map(x => x.toUpperCase()) // causes an error!
 >map(x => x.toUpperCase()) : (s: SetOf<number>) => SetOf<any>
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types b/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types
index b535ff9c876..0524f0f522e 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types
@@ -658,8 +658,8 @@ testSet.add(1);
 >        : ^^^^^^^^^^^^^
 >add : (a: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 testSet.add(2);
 >testSet.add(2) : void
@@ -670,8 +670,8 @@ testSet.add(2);
 >        : ^^^^^^^^^^^^^
 >add : (a: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 testSet.add(3);
 >testSet.add(3) : void
@@ -682,8 +682,8 @@ testSet.add(3);
 >        : ^^^^^^^^^^^^^
 >add : (a: number) => void
 >    : ^ ^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 const t1 = testSet.transform(
 >t1 : SetOf<string>
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types b/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types
index ddeb0185d60..c4a3eace144 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types
@@ -100,8 +100,8 @@ function wrappedBar(): Wrap<'bar'> {
     const value2: string = 'bar';
 >value2 : string
 >       : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
     const literal2 = wrapBar(value2);  // Error
 >literal2 : Wrap<"bar">
@@ -200,10 +200,10 @@ let arr: Array<[number, number]> = [[1, 2]]
 >         : ^^^^^^^^^^^^^^^^^^
 >[1, 2] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 let mappedArr: Array<[number, number]> = arr.map(([x, y]) => {
 >mappedArr : [number, number][]
@@ -327,8 +327,8 @@ function bug(): Diagnostic[] {
 			message: 'message'
 >message : string
 >        : ^^^^^^
->'message' : string
->          : ^^^^^^
+>'message' : "message"
+>          : ^^^^^^^^^
 		}
 	});
 }
@@ -532,10 +532,10 @@ let result: OK<[string, number]> = ok(["hello", 12]);
 >   : ^ ^^     ^^ ^^^^^     
 >["hello", 12] : [string, number]
 >              : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->12 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>12 : 12
+>   : ^^
 
 // Repro from #25889
 
@@ -633,14 +633,14 @@ const f1: F = () => {
             name: "David Gomes",
 >name : string
 >     : ^^^^^^
->"David Gomes" : string
->              : ^^^^^^
+>"David Gomes" : "David Gomes"
+>              : ^^^^^^^^^^^^^
 
             age: 23,
 >age : number
 >    : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
             position: "GOALKEEPER",
 >position : "GOALKEEPER"
@@ -655,14 +655,14 @@ const f1: F = () => {
             name: "Cristiano Ronaldo",
 >name : string
 >     : ^^^^^^
->"Cristiano Ronaldo" : string
->                    : ^^^^^^
+>"Cristiano Ronaldo" : "Cristiano Ronaldo"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
             age: 33,
 >age : number
 >    : ^^^^^^
->33 : number
->   : ^^^^^^
+>33 : 33
+>   : ^^
 
             position: "STRIKER",
 >position : "STRIKER"
diff --git a/tests/baselines/reference/inferFromNestedSameShapeTuple.types b/tests/baselines/reference/inferFromNestedSameShapeTuple.types
index 3efb5a4fda9..423bf38a71d 100644
--- a/tests/baselines/reference/inferFromNestedSameShapeTuple.types
+++ b/tests/baselines/reference/inferFromNestedSameShapeTuple.types
@@ -33,36 +33,36 @@ declare function getIds<Id>(items: readonly Recursive<Id>[]): Id[];
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 const items = [{
->items : readonly [{ readonly id: string; readonly children: readonly [{ readonly id: string; readonly children: readonly []; }]; }]
->      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[{    id: 'a',    children: [{        id: 'b',        children: []    }]}] as const satisfies readonly Recursive<string>[] : readonly [{ readonly id: string; readonly children: readonly [{ readonly id: string; readonly children: readonly []; }]; }]
->                                                                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[{    id: 'a',    children: [{        id: 'b',        children: []    }]}] as const : readonly [{ readonly id: string; readonly children: readonly [{ readonly id: string; readonly children: readonly []; }]; }]
->                                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[{    id: 'a',    children: [{        id: 'b',        children: []    }]}] : readonly [{ readonly id: string; readonly children: readonly [{ readonly id: string; readonly children: readonly []; }]; }]
->                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->{    id: 'a',    children: [{        id: 'b',        children: []    }]} : { readonly id: string; readonly children: readonly [{ readonly id: string; readonly children: readonly []; }]; }
->                                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>items : readonly [{ readonly id: "a"; readonly children: readonly [{ readonly id: "b"; readonly children: readonly []; }]; }]
+>      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>[{    id: 'a',    children: [{        id: 'b',        children: []    }]}] as const satisfies readonly Recursive<string>[] : readonly [{ readonly id: "a"; readonly children: readonly [{ readonly id: "b"; readonly children: readonly []; }]; }]
+>                                                                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>[{    id: 'a',    children: [{        id: 'b',        children: []    }]}] as const : readonly [{ readonly id: "a"; readonly children: readonly [{ readonly id: "b"; readonly children: readonly []; }]; }]
+>                                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>[{    id: 'a',    children: [{        id: 'b',        children: []    }]}] : readonly [{ readonly id: "a"; readonly children: readonly [{ readonly id: "b"; readonly children: readonly []; }]; }]
+>                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>{    id: 'a',    children: [{        id: 'b',        children: []    }]} : { readonly id: "a"; readonly children: readonly [{ readonly id: "b"; readonly children: readonly []; }]; }
+>                                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     id: 'a',
->id : string
->   : ^^^^^^
->'a' : string
->    : ^^^^^^
+>id : "a"
+>   : ^^^
+>'a' : "a"
+>    : ^^^
 
     children: [{
->children : readonly [{ readonly id: string; readonly children: readonly []; }]
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[{        id: 'b',        children: []    }] : readonly [{ readonly id: string; readonly children: readonly []; }]
->                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->{        id: 'b',        children: []    } : { readonly id: string; readonly children: readonly []; }
->                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>children : readonly [{ readonly id: "b"; readonly children: readonly []; }]
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>[{        id: 'b',        children: []    }] : readonly [{ readonly id: "b"; readonly children: readonly []; }]
+>                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>{        id: 'b',        children: []    } : { readonly id: "b"; readonly children: readonly []; }
+>                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         id: 'b',
->id : string
->   : ^^^^^^
->'b' : string
->    : ^^^^^^
+>id : "b"
+>   : ^^^
+>'b' : "b"
+>    : ^^^
 
         children: []
 >children : readonly []
@@ -74,14 +74,14 @@ const items = [{
 }] as const satisfies readonly Recursive<string>[]
 
 const foo = getIds(items)
->foo : string[]
->    : ^^^^^^^^
->getIds(items) : string[]
->              : ^^^^^^^^
+>foo : ("a" | "b")[]
+>    : ^^^^^^^^^^^^^
+>getIds(items) : ("a" | "b")[]
+>              : ^^^^^^^^^^^^^
 >getIds : <Id>(items: readonly Recursive<Id>[]) => Id[]
 >       : ^  ^^     ^^                        ^^^^^    
->items : readonly [{ readonly id: string; readonly children: readonly [{ readonly id: string; readonly children: readonly []; }]; }]
->      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>items : readonly [{ readonly id: "a"; readonly children: readonly [{ readonly id: "b"; readonly children: readonly []; }]; }]
+>      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // variant with a fresh argument
 const foo2 = getIds([{
diff --git a/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types b/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types
index 92f45642448..b228174004c 100644
--- a/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types
+++ b/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types
@@ -40,16 +40,16 @@ const y = inference2({ a: 1, b: 2, c: 3, d(n) { return n } }, two);
 >                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >c : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >d : (n: any) => any
 >  : ^ ^^^^^^^^^^^^^
 >n : any
diff --git a/tests/baselines/reference/inferParameterWithMethodCallInitializer.types b/tests/baselines/reference/inferParameterWithMethodCallInitializer.types
index f3fd34a789a..180a5207374 100644
--- a/tests/baselines/reference/inferParameterWithMethodCallInitializer.types
+++ b/tests/baselines/reference/inferParameterWithMethodCallInitializer.types
@@ -6,8 +6,8 @@ function getNumber(): number {
 >          : ^^^^^^      
 
     return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 class Example {
 >Example : Example
@@ -18,8 +18,8 @@ class Example {
 >          : ^^^^^^      
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
     doSomething(a = this.getNumber()): typeof a {
 >doSomething : (a?: number) => typeof a
diff --git a/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types b/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types
index a4b7c8b9731..08a2b11f730 100644
--- a/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types
+++ b/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types
@@ -32,8 +32,8 @@ repro({
   params: 1,
 >params : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   callback: () => { return a => a + 1 },
 >callback : () => (a: number) => number
diff --git a/tests/baselines/reference/inferRestArgumentsMappedTuple.types b/tests/baselines/reference/inferRestArgumentsMappedTuple.types
index a99bd122e7f..33169cbccaa 100644
--- a/tests/baselines/reference/inferRestArgumentsMappedTuple.types
+++ b/tests/baselines/reference/inferRestArgumentsMappedTuple.types
@@ -39,14 +39,14 @@ const myPrimitiveTupleOld: [string, number] = extractPrimitivesOld({ primitive:
 >                  : ^^^^^^^^^^^^^^^^^^^^^^
 >primitive : string
 >          : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >{ primitive: 0 } : { primitive: number; }
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
 >primitive : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 type TupleMapperNew<Tuple extends any[]> = {
 >TupleMapperNew : TupleMapperNew<Tuple>
@@ -76,12 +76,12 @@ const myPrimitiveTupleNew: [string, number] = extractPrimitivesNew({ primitive:
 >                  : ^^^^^^^^^^^^^^^^^^^^^^
 >primitive : string
 >          : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >{ primitive: 0 } : { primitive: number; }
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
 >primitive : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/inferSecondaryParameter.types b/tests/baselines/reference/inferSecondaryParameter.types
index 3314c0c5895..c65978532d3 100644
--- a/tests/baselines/reference/inferSecondaryParameter.types
+++ b/tests/baselines/reference/inferSecondaryParameter.types
@@ -33,7 +33,7 @@ b.m("test", function (bug) {
 >  : ^^
 >m : (test: string, fn: Function) => any
 >  : ^    ^^      ^^  ^^        ^^^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 >function (bug) {    var a: number = bug;} : (bug: any) => void
 >                                          : ^   ^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/inferSetterParamType.types b/tests/baselines/reference/inferSetterParamType.types
index d1be63325b8..a85f38afd35 100644
--- a/tests/baselines/reference/inferSetterParamType.types
+++ b/tests/baselines/reference/inferSetterParamType.types
@@ -30,8 +30,8 @@ class Foo2 {
 >    : ^^^^^^
 
         return 0; // should be an error - can't coerce infered return type to match setter annotated type
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
     set bar(n:string) {
 >bar : string
diff --git a/tests/baselines/reference/inferTupleFromBindingPattern.types b/tests/baselines/reference/inferTupleFromBindingPattern.types
index 6a40883e835..7506ede6329 100644
--- a/tests/baselines/reference/inferTupleFromBindingPattern.types
+++ b/tests/baselines/reference/inferTupleFromBindingPattern.types
@@ -22,10 +22,10 @@ const [e1, e2, e3] = f(() => [1, "hi", true]);
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, "hi", true] : [number, string, true]
 >                : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>1 : 1
+>  : ^
+>"hi" : "hi"
+>     : ^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/inferTypeParameterConstraints.types b/tests/baselines/reference/inferTypeParameterConstraints.types
index 2b65f693f29..d3a97252cd9 100644
--- a/tests/baselines/reference/inferTypeParameterConstraints.types
+++ b/tests/baselines/reference/inferTypeParameterConstraints.types
@@ -48,8 +48,8 @@ class BaseClass<V> {
 >              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
 }
 
diff --git a/tests/baselines/reference/inferTypePredicates.types b/tests/baselines/reference/inferTypePredicates.types
index 09f01a33d45..e604e593a0e 100644
--- a/tests/baselines/reference/inferTypePredicates.types
+++ b/tests/baselines/reference/inferTypePredicates.types
@@ -732,8 +732,8 @@ a.push(10);
 >  : ^^^^^^^^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 // Defer to explicit type guards, even when they're incorrect.
 function backwardsGuard(x: number|string): x is number {
@@ -949,12 +949,12 @@ function irrelevantIsNumber(x: string | number) {
 >  : ^^^^^^^^^^^^^^^
 
 	x = Math.random() < 0.5 ? "string" : 123;
->x = Math.random() < 0.5 ? "string" : 123 : string | number
->                                         : ^^^^^^^^^^^^^^^
+>x = Math.random() < 0.5 ? "string" : 123 : "string" | 123
+>                                         : ^^^^^^^^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->Math.random() < 0.5 ? "string" : 123 : string | number
->                                     : ^^^^^^^^^^^^^^^
+>Math.random() < 0.5 ? "string" : 123 : "string" | 123
+>                                     : ^^^^^^^^^^^^^^
 >Math.random() < 0.5 : boolean
 >                    : ^^^^^^^
 >Math.random() : number
@@ -967,10 +967,10 @@ function irrelevantIsNumber(x: string | number) {
 >       : ^^^^^^      
 >0.5 : 0.5
 >    : ^^^
->"string" : string
->         : ^^^^^^
->123 : number
->    : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>123 : 123
+>    : ^^^
 
   return typeof x === 'string';
 >typeof x === 'string' : boolean
@@ -997,8 +997,8 @@ function irrelevantIsNumberDestructuring(x: string | number) {
 >  : ^^^^^^^^^^^^^^^
 >[Math.random() < 0.5 ? "string" : 123] : [string | number]
 >                                       : ^^^^^^^^^^^^^^^^^
->Math.random() < 0.5 ? "string" : 123 : string | number
->                                     : ^^^^^^^^^^^^^^^
+>Math.random() < 0.5 ? "string" : 123 : "string" | 123
+>                                     : ^^^^^^^^^^^^^^
 >Math.random() < 0.5 : boolean
 >                    : ^^^^^^^
 >Math.random() : number
@@ -1011,10 +1011,10 @@ function irrelevantIsNumberDestructuring(x: string | number) {
 >       : ^^^^^^      
 >0.5 : 0.5
 >    : ^^^
->"string" : string
->         : ^^^^^^
->123 : number
->    : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>123 : 123
+>    : ^^^
 
   return typeof x === 'string';
 >typeof x === 'string' : boolean
@@ -1346,8 +1346,8 @@ if (isShortString(str)) {
 >    : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 } else {
   str.charAt(0);  // should ok
@@ -1359,8 +1359,8 @@ if (isShortString(str)) {
 >    : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function isStringFromUnknown(x: unknown) {
@@ -1396,8 +1396,8 @@ if (isStringFromUnknown(str)) {
 >    : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 } else {
   let t: never = str;  // should OK
diff --git a/tests/baselines/reference/inferTypes1.types b/tests/baselines/reference/inferTypes1.types
index a8d15b63f2a..edc97a2ea14 100644
--- a/tests/baselines/reference/inferTypes1.types
+++ b/tests/baselines/reference/inferTypes1.types
@@ -705,8 +705,8 @@ const result = invoker('test', true)({ test: (a: boolean) => 123 })
 >                    : ^ ^^       ^^^^^^^^^^^
 >a : boolean
 >  : ^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 type Foo2<A extends any[]> = ReturnType<(...args: A) => string>;
 >Foo2 : string
diff --git a/tests/baselines/reference/inferenceFromIncompleteSource.types b/tests/baselines/reference/inferenceFromIncompleteSource.types
index c5b1f1510c3..e634c003fdb 100644
--- a/tests/baselines/reference/inferenceFromIncompleteSource.types
+++ b/tests/baselines/reference/inferenceFromIncompleteSource.types
@@ -38,8 +38,8 @@ Component({items: [{name:' string'}], itemKey: 'name' });
 >                 : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->' string' : string
->          : ^^^^^^
+>' string' : " string"
+>          : ^^^^^^^^^
 >itemKey : "name"
 >        : ^^^^^^
 >'name' : "name"
diff --git a/tests/baselines/reference/inferenceFromParameterlessLambda.types b/tests/baselines/reference/inferenceFromParameterlessLambda.types
index 0e78c57a0a2..c0938298026 100644
--- a/tests/baselines/reference/inferenceFromParameterlessLambda.types
+++ b/tests/baselines/reference/inferenceFromParameterlessLambda.types
@@ -35,6 +35,6 @@ foo(n => n.length, () => 'hi');
 >       : ^^^^^^
 >() => 'hi' : () => string
 >           : ^^^^^^^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types b/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
index 06a98c19921..dbdf6925d68 100644
--- a/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
+++ b/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
@@ -176,6 +176,6 @@ const query = Object.entries(obj).map(
 ).join('&');
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->'&' : string
->    : ^^^^^^
+>'&' : "&"
+>    : ^^^
 
diff --git a/tests/baselines/reference/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult.types b/tests/baselines/reference/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult.types
index 1ac149c8983..baefcbc0701 100644
--- a/tests/baselines/reference/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult.types
+++ b/tests/baselines/reference/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult.types
@@ -125,8 +125,8 @@ export class Foo<T> extends Base<T> {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         return new Foo(v);
 >new Foo(v) : Foo<Assign<T, { x: number; }>>
diff --git a/tests/baselines/reference/inferenceShouldFailOnEvolvingArrays.types b/tests/baselines/reference/inferenceShouldFailOnEvolvingArrays.types
index 12a7a736e6a..e9e97df4a69 100644
--- a/tests/baselines/reference/inferenceShouldFailOnEvolvingArrays.types
+++ b/tests/baselines/reference/inferenceShouldFailOnEvolvingArrays.types
@@ -34,8 +34,8 @@ logLength(42);  // error
 >              : ^^^^^^
 >logLength : <T extends string, U extends string>(arg: { [K in U]: T; }[U]) => T
 >          : ^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^   ^^                   ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let z;
 >z : any
@@ -50,8 +50,8 @@ z = logLength(42);  // no error; T is inferred as `any`
 >              : ^^^^^^
 >logLength : <T extends string, U extends string>(arg: { [K in U]: T; }[U]) => T
 >          : ^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^   ^^                   ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 function logFirstLength<T extends string[], U extends string>(arg: { [K in U]: T }[U]): T {
 >logFirstLength : <T extends string[], U extends string>(arg: { [K in U]: T; }[U]) => T
@@ -90,8 +90,8 @@ logFirstLength([42]);  // error
 >               : ^ ^^^^^^^^^        ^^ ^^^^^^^^^      ^^   ^^                   ^^^^^ 
 >[42] : number[]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let zz = [];
 >zz : any[]
@@ -112,8 +112,8 @@ zz.push(logLength(42));  // no error; T is inferred as `any`
 >              : ^^^^^^
 >logLength : <T extends string, U extends string>(arg: { [K in U]: T; }[U]) => T
 >          : ^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^   ^^                   ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 zz = logFirstLength([42]);  // no error; T is inferred as `any[]`
 >zz = logFirstLength([42]) : string[]
@@ -126,6 +126,6 @@ zz = logFirstLength([42]);  // no error; T is inferred as `any[]`
 >               : ^ ^^^^^^^^^        ^^ ^^^^^^^^^      ^^   ^^                   ^^^^^ 
 >[42] : number[]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/inferenceUnionOfObjectsMappedContextualType.types b/tests/baselines/reference/inferenceUnionOfObjectsMappedContextualType.types
index cafe5ff6a13..b7e8b5a5740 100644
--- a/tests/baselines/reference/inferenceUnionOfObjectsMappedContextualType.types
+++ b/tests/baselines/reference/inferenceUnionOfObjectsMappedContextualType.types
@@ -49,8 +49,8 @@ const test: RowRenderer<Entity> = {
     caption: 'My Date',
 >caption : string
 >        : ^^^^^^
->'My Date' : string
->          : ^^^^^^
+>'My Date' : "My Date"
+>          : ^^^^^^^^^
 
     formatter: (value) => value ? value.toString() : '-' // value: any
 >formatter : (value: Date | null) => string
@@ -71,7 +71,7 @@ const test: RowRenderer<Entity> = {
 >      : ^^^^
 >toString : () => string
 >         : ^^^^^^      
->'-' : string
->    : ^^^^^^
+>'-' : "-"
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types
index c49e09b2f33..a7810422c9c 100644
--- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types
+++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types
@@ -23,8 +23,8 @@ foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }
 >                                                                                  : ^^^^^^
 >foo : <T, U>(x: T, y: Int<T, U>, z: Int<U, T>) => T
 >    : ^ ^^ ^^ ^^ ^^ ^^         ^^ ^^         ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >{ method(p1) { return p1.length } } : { method(p1: string): number; }
 >                                    : ^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^
 >method : (p1: string) => number
diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
index 860997395a6..084f93e089b 100644
--- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
+++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
@@ -23,8 +23,8 @@ foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }
 >                                                                                  : ^^^^^^
 >foo : <T, U>(x: T, y: Int<T, U>, z: Int<U, T>) => T
 >    : ^ ^^ ^^ ^^ ^^ ^^         ^^ ^^         ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >{ method(p1) { return p1.length } } : { method(p1: string): number; }
 >                                    : ^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^
 >method : (p1: string) => number
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType.types b/tests/baselines/reference/inferentialTypingWithFunctionType.types
index f68df77fda1..bad6c1ba9a1 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType.types
@@ -24,8 +24,8 @@ var s = map("", identity);
 >                  : ^^^^^^
 >map : <T, U>(x: T, f: (s: T) => U) => U
 >    : ^ ^^ ^^ ^^ ^^ ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >identity : <V>(y: V) => V
 >         : ^ ^^ ^^ ^^^^^ 
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
index e76f5de0a5f..de69d871f2d 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
@@ -26,8 +26,8 @@ var s = map("", () => { return { x: identity }; });
 >                                           : ^^^^^^
 >map : <T, U>(x: T, f: () => { x: (s: T) => U; }) => U
 >    : ^ ^^ ^^ ^^ ^^ ^^                         ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >() => { return { x: identity }; } : () => { x: (y: string) => string; }
 >                                  : ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^
 >{ x: identity } : { x: <V>(y: V) => V; }
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
index 662fe2ef89f..7253f75b4b0 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
@@ -41,8 +41,8 @@ s = map("", dottedIdentity.x);
 >                          : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >dottedIdentity.x : <V>(y: V) => V
 >                 : ^ ^^ ^^ ^^^^^ 
 >dottedIdentity : { x: <V>(y: V) => V; }
@@ -60,8 +60,8 @@ s = map("", dottedIdentity['x']);
 >                             : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >dottedIdentity['x'] : <V>(y: V) => V
 >                    : ^ ^^ ^^ ^^^^^ 
 >dottedIdentity : { x: <V>(y: V) => V; }
@@ -79,8 +79,8 @@ s = map("", (() => identity)());
 >                            : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >(() => identity)() : <V>(y: V) => V
 >                   : ^ ^^ ^^ ^^^^^ 
 >(() => identity) : () => <V>(y: V) => V
@@ -109,8 +109,8 @@ s = map("", new ic());
 >                  : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >new ic() : <V>(y: V) => V
 >         : ^ ^^ ^^ ^^^^^ 
 >ic : IdentityConstructor
@@ -129,8 +129,8 @@ s = map("", t = identity);
 >                      : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >t = identity : <V>(y: V) => V
 >             : ^ ^^ ^^ ^^^^^ 
 >t : any
@@ -147,8 +147,8 @@ s = map("", <typeof identity>identity);
 >                                   : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 ><typeof identity>identity : <V>(y: V) => V
 >                          : ^ ^^ ^^ ^^^^^ 
 >identity : <V>(y: V) => V
@@ -166,8 +166,8 @@ s = map("", (identity));
 >                    : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >(identity) : <V>(y: V) => V
 >           : ^ ^^ ^^ ^^^^^ 
 >identity : <V>(y: V) => V
@@ -183,8 +183,8 @@ s = map("", ("", identity));
 >                        : ^^^^^^
 >map : <T, U>(array: T, func: (x: T) => U) => U
 >    : ^ ^^ ^^     ^^ ^^    ^^           ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >("", identity) : <V>(y: V) => V
 >               : ^ ^^ ^^ ^^^^^ 
 >"", identity : <V>(y: V) => V
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
index d58bfcffada..e606f9e44bb 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
@@ -36,16 +36,16 @@ var result = zipWith([1, 2], ['a', 'b'], pair);
 >        : ^ ^^ ^^ ^^ ^^   ^^ ^^   ^^ ^^                     ^^^^^   
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >['a', 'b'] : string[]
 >           : ^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 >pair : <T, S>(x: T) => (y: S) => { x: T; y: S; }
 >     : ^ ^^ ^^ ^^ ^^^^^                         
 
diff --git a/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types b/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types
index 3af1a206b81..35f438956e0 100644
--- a/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types
+++ b/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types
@@ -14,8 +14,8 @@ return x;
 >  : ^
 }
 f({ x: [null] }, { x: [1] }).x[0] = "" // ok
->f({ x: [null] }, { x: [1] }).x[0] = "" : string
->                                       : ^^^^^^
+>f({ x: [null] }, { x: [1] }).x[0] = "" : ""
+>                                       : ^^
 >f({ x: [null] }, { x: [1] }).x[0] : number
 >                                  : ^^^^^^
 >f({ x: [null] }, { x: [1] }).x : number[]
@@ -36,18 +36,18 @@ f({ x: [null] }, { x: [1] }).x[0] = "" // ok
 >  : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >x : number[]
 >  : ^^^^^^^^
 >0 : 0
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 f({ x: [1] }, { x: [null] }).x[0] = "" // was error TS2011: Cannot convert 'string' to 'number'.
->f({ x: [1] }, { x: [null] }).x[0] = "" : string
->                                       : ^^^^^^
+>f({ x: [1] }, { x: [null] }).x[0] = "" : ""
+>                                       : ^^
 >f({ x: [1] }, { x: [null] }).x[0] : number
 >                                  : ^^^^^^
 >f({ x: [1] }, { x: [null] }).x : number[]
@@ -62,8 +62,8 @@ f({ x: [1] }, { x: [null] }).x[0] = "" // was error TS2011: Cannot convert 'stri
 >  : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ x: [null] } : { x: null[]; }
 >              : ^^^^^^^^^^^^^^
 >x : null[]
@@ -74,6 +74,6 @@ f({ x: [1] }, { x: [null] }).x[0] = "" // was error TS2011: Cannot convert 'stri
 >  : ^^^^^^^^
 >0 : 0
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/inferringReturnTypeFromConstructSignatureGeneric.types b/tests/baselines/reference/inferringReturnTypeFromConstructSignatureGeneric.types
index 93b412cfccb..1df958c235d 100644
--- a/tests/baselines/reference/inferringReturnTypeFromConstructSignatureGeneric.types
+++ b/tests/baselines/reference/inferringReturnTypeFromConstructSignatureGeneric.types
@@ -101,8 +101,8 @@ g2.give(1);
 >   : ^^^^^^^^^^^^^^^^^^^^^
 >give : (value: number) => number
 >     : ^     ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const g3 = g(GenericNumberOrString);
 >g3 : GenericNumberOrString<string | number>
@@ -123,8 +123,8 @@ g3.give(1);
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >give : (value: string | number) => string | number
 >     : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 g3.give('1');
 >g3.give('1') : string | number
@@ -135,8 +135,8 @@ g3.give('1');
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >give : (value: string | number) => string | number
 >     : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 
 // repro from #35636
 class C<T> {}
diff --git a/tests/baselines/reference/infiniteConstraints.types b/tests/baselines/reference/infiniteConstraints.types
index 5246f6acaab..db1a3468d2e 100644
--- a/tests/baselines/reference/infiniteConstraints.types
+++ b/tests/baselines/reference/infiniteConstraints.types
@@ -48,7 +48,7 @@ const out = myBug({obj1: {a: "test"}})
 >            : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 type Value<V extends string = string> = Record<"val", V>;
diff --git a/tests/baselines/reference/inheritance.types b/tests/baselines/reference/inheritance.types
index 10a45f4c8d1..4d199097e88 100644
--- a/tests/baselines/reference/inheritance.types
+++ b/tests/baselines/reference/inheritance.types
@@ -64,8 +64,8 @@ class Good {
 >  : ^^^^^^      
 >function () { return 0; } : () => number
 >                          : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public g() { return 0; }
 >g : () => number
@@ -83,8 +83,8 @@ class Baad extends Good {
     public f(): number { return 0; }
 >f : () => number
 >  : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public g(n: number) { return 0; }
 >g : (n: number) => number
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.types b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.types
index fa2344348e7..fc8495a45cc 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.types
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.types
@@ -10,8 +10,8 @@ class a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     set x(aValue: string) {
 >x : string
@@ -33,8 +33,8 @@ class b extends a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.types b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.types
index 6fd322400f3..a69840ac828 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.types
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.types
@@ -21,8 +21,8 @@ class b extends a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.types b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.types
index fc1c09624fe..1129c99925e 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.types
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.types
@@ -10,8 +10,8 @@ class a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.types b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.types
index f1a54d4108d..7e95d11d9a9 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.types
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.types
@@ -10,8 +10,8 @@ class a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     static set x(aValue: string) {
 >x : string
@@ -33,8 +33,8 @@ class b extends a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     static set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.types b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.types
index 1b71a4c905c..b0023942e00 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.types
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.types
@@ -26,8 +26,8 @@ class b extends a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     static set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.types b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.types
index 43ea2edae12..70c9b41d027 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.types
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.types
@@ -21,8 +21,8 @@ class b extends a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     static set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.types b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.types
index 52c86b3642c..7cc6c9e9ffb 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.types
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.types
@@ -10,8 +10,8 @@ class a {
 >  : ^^^^^^
 
         return "20";
->"20" : string
->     : ^^^^^^
+>"20" : "20"
+>     : ^^^^
     }
     static set x(aValue: string) {
 >x : string
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams.types b/tests/baselines/reference/inheritedConstructorWithRestParams.types
index bb77d52002f..da7bb6cc34a 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.types
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.types
@@ -22,18 +22,18 @@ new Derived("", "");
 >                    : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
 new Derived("");
 >new Derived("") : Derived
 >                : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 new Derived();
 >new Derived() : Derived
@@ -47,16 +47,16 @@ new Derived("", 3);
 >                   : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new Derived(3);
 >new Derived(3) : Derived
 >               : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams2.types b/tests/baselines/reference/inheritedConstructorWithRestParams2.types
index 4e81e37b165..452287f67b9 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.types
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.types
@@ -69,84 +69,84 @@ new Derived("", "");
 >                    : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
 new Derived("", 3);
 >new Derived("", 3) : Derived
 >                   : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new Derived("", 3, 3);
 >new Derived("", 3, 3) : Derived
 >                      : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 new Derived("", 3, 3, 3);
 >new Derived("", 3, 3, 3) : Derived
 >                         : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 new Derived("", 3, "");
 >new Derived("", 3, "") : Derived
 >                       : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
+>"" : ""
+>   : ^^
 
 new Derived("", "", 3);
 >new Derived("", "", 3) : Derived
 >                       : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new Derived("", "", 3, 3);
 >new Derived("", "", 3, 3) : Derived
 >                          : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 // Errors
 new Derived(3);
@@ -154,34 +154,34 @@ new Derived(3);
 >               : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 new Derived("", 3, "", 3);
 >new Derived("", 3, "", 3) : Derived
 >                          : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new Derived("", 3, "", "");
 >new Derived("", 3, "", "") : Derived
 >                           : ^^^^^^^
 >Derived : typeof Derived
 >        : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>3 : 3
+>  : ^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.types b/tests/baselines/reference/inheritedModuleMembersForClodule.types
index d581d8eb383..08dad5b828d 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.types
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.types
@@ -10,8 +10,8 @@ class C {
 >    : ^^^^^^      
 
         return "123";
->"123" : string
->      : ^^^^^^
+>"123" : "123"
+>      : ^^^^^
     }
 }
 
@@ -31,8 +31,8 @@ module D {
 >    : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     };
 }
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
index 6237e9d22ec..22cace14481 100644
--- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
+++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
@@ -31,8 +31,8 @@ b('foo').charAt(0);
 >      : ^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 interface A {
     (x: 'A1'): string;
@@ -132,8 +132,8 @@ var x5: void = c('A0');
 >        : ^^^^
 >c : C
 >  : ^
->'A0' : string
->     : ^^^^^^
+>'A0' : "A0"
+>     : ^^^^
 
 var x6: number[] = c('C1');
 >x6 : number[]
@@ -172,6 +172,6 @@ var x9: void = c('generic');
 >             : ^^^^
 >c : C
 >  : ^
->'generic' : string
->          : ^^^^^^
+>'generic' : "generic"
+>          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/initializerWithThisPropertyAccess.types b/tests/baselines/reference/initializerWithThisPropertyAccess.types
index 3fc4d6481ce..b9391c3771a 100644
--- a/tests/baselines/reference/initializerWithThisPropertyAccess.types
+++ b/tests/baselines/reference/initializerWithThisPropertyAccess.types
@@ -47,16 +47,16 @@ class A {
 
     constructor() {
         this.a = 1;
->this.a = 1 : number
->           : ^^^^^^
+>this.a = 1 : 1
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
index 4a26fd82ea3..a12452b695a 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
@@ -264,36 +264,36 @@ export const tree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={
 >      : ^     ^^                                                          ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 ><MyClass x={3} y={4} /> : predom.JSX.Element
 >                        : ^^^^^^^^^^^^^^^^^^
 >MyClass : typeof MyClass
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 ><MyClass x={5} y={6} /> : predom.JSX.Element
 >                        : ^^^^^^^^^^^^^^^^^^
 >MyClass : typeof MyClass
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >MySFC : (props: { x: number; y: number; children?: predom.JSX.Element[]; }) => predom.JSX.Element
 >      : ^     ^^                                                          ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -499,36 +499,36 @@ const _tree = <DOMSFC x={1} y={2}><DOMClass x={3} y={4} /><DOMClass x={5} y={6}
 >       : ^     ^^                                                       ^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 ><DOMClass x={3} y={4} /> : dom.JSX.Element
 >                         : ^^^^^^^^^^^^^^^
 >DOMClass : typeof DOMClass
 >         : ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 ><DOMClass x={5} y={6} /> : dom.JSX.Element
 >                         : ^^^^^^^^^^^^^^^
 >DOMClass : typeof DOMClass
 >         : ^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >DOMSFC : (props: { x: number; y: number; children?: dom.JSX.Element[]; }) => dom.JSX.Element
 >       : ^     ^^                                                       ^^^^^^^^^^^^^^^^^^^^
 
@@ -542,36 +542,36 @@ const _brokenTree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={
 >      : ^     ^^                                          ^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 ><MyClass x={3} y={4} /> : dom.JSX.Element
 >                        : ^^^^^^^^^^^^^^^
 >MyClass : typeof MyClass
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 ><MyClass x={5} y={6} /> : dom.JSX.Element
 >                        : ^^^^^^^^^^^^^^^
 >MyClass : typeof MyClass
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
 >      : ^     ^^                                          ^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -585,12 +585,12 @@ const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
 >       : ^     ^^                                                       ^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >tree : import("renderer2").predom.JSX.Element
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tree : import("renderer2").predom.JSX.Element
diff --git a/tests/baselines/reference/inlinedAliasAssignableToConstraintSameAsAlias.types b/tests/baselines/reference/inlinedAliasAssignableToConstraintSameAsAlias.types
index 272006f6453..bf11e3314f0 100644
--- a/tests/baselines/reference/inlinedAliasAssignableToConstraintSameAsAlias.types
+++ b/tests/baselines/reference/inlinedAliasAssignableToConstraintSameAsAlias.types
@@ -51,8 +51,8 @@ class A {
     A2 extends A = ShouldA<RF, N>
   >(): number {
     return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/innerOverloads.types b/tests/baselines/reference/innerOverloads.types
index 711fe3e7e0d..5abd99eb88e 100644
--- a/tests/baselines/reference/innerOverloads.types
+++ b/tests/baselines/reference/innerOverloads.types
@@ -27,8 +27,8 @@ function outer() {
 >inner(0) : any
 >inner : { (x: number): any; (x: string): any; }
 >      : ^^^ ^^      ^^^^^^^^^ ^^      ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 var x = outer(); // should work
diff --git a/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types b/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types
index a40c62de81c..fb5eaecad41 100644
--- a/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types
+++ b/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types
@@ -30,8 +30,8 @@ takesCallback(
 		var k: string = 10; 
 >k : string
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 );
 
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.types b/tests/baselines/reference/instanceAndStaticDeclarations1.types
index 2decc6c1c49..675463c9577 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.types
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.types
@@ -86,10 +86,10 @@ class Point {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
     static distance(p1: Point, p2: Point) { return p1.distance(p2); }
 >distance : (p1: Point, p2: Point) => number
diff --git a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.types b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.types
index 36d2b0b25f3..6effbd1c400 100644
--- a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.types
+++ b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.types
@@ -85,11 +85,11 @@ class C {
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/instanceMemberInitialization.types b/tests/baselines/reference/instanceMemberInitialization.types
index 533c1f3cacf..445def59523 100644
--- a/tests/baselines/reference/instanceMemberInitialization.types
+++ b/tests/baselines/reference/instanceMemberInitialization.types
@@ -21,16 +21,16 @@ var c = new C();
 >  : ^^^^^^^^
 
 c.x = 3;
->c.x = 3 : number
->        : ^^^^^^
+>c.x = 3 : 3
+>        : ^
 >c.x : number
 >    : ^^^^^^
 >c : C
 >  : ^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var c2 = new C();
 >c2 : C
diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types
index 61a18be63be..328afd4d2ac 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types
@@ -55,10 +55,10 @@ module NonGeneric {
 >            : ^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
     var r = d.fn();
 >r : D
@@ -93,16 +93,16 @@ module NonGeneric {
 >  : ^^^^^^
 
     r.y = 4;
->r.y = 4 : number
->        : ^^^^^^
+>r.y = 4 : 4
+>        : ^
 >r.y : number
 >    : ^^^^^^
 >r : D
 >  : ^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
     var r6 = d.y(); // error
 >r6 : any
@@ -170,10 +170,10 @@ module Generic {
 >             : ^^^^^^^^^^^^^^^^^
 >D : typeof D
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
     var r = d.fn();
 >r : D<number, string>
@@ -208,16 +208,16 @@ module Generic {
 >  : ^^^^^^
 
     r.y = '';
->r.y = '' : string
->         : ^^^^^^
+>r.y = '' : ""
+>         : ^^
 >r.y : string
 >    : ^^^^^^
 >r : D<number, string>
 >  : ^^^^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r6 = d.y(); // error
 >r6 : any
diff --git a/tests/baselines/reference/instancePropertyInClassType.types b/tests/baselines/reference/instancePropertyInClassType.types
index 58faeb438ba..5d8e998220b 100644
--- a/tests/baselines/reference/instancePropertyInClassType.types
+++ b/tests/baselines/reference/instancePropertyInClassType.types
@@ -47,10 +47,10 @@ module NonGeneric {
 >            : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
     var r = c.fn();
 >r : C
@@ -85,16 +85,16 @@ module NonGeneric {
 >  : ^^^^^^
 
     r.y = 4;
->r.y = 4 : number
->        : ^^^^^^
+>r.y = 4 : 4
+>        : ^
 >r.y : number
 >    : ^^^^^^
 >r : C
 >  : ^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
     var r6 = c.y(); // error
 >r6 : any
@@ -154,10 +154,10 @@ module Generic {
 >             : ^^^^^^^^^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
     var r = c.fn();
 >r : C<number, string>
@@ -192,16 +192,16 @@ module Generic {
 >  : ^^^^^^
 
     r.y = '';
->r.y = '' : string
->         : ^^^^^^
+>r.y = '' : ""
+>         : ^^
 >r.y : string
 >    : ^^^^^^
 >r : C<number, string>
 >  : ^^^^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     var r6 = c.y(); // error
 >r6 : any
diff --git a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types
index bc107e38a60..1e6670f3a5f 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types
@@ -80,8 +80,8 @@ function foo1(x: C1 | C2 | C3): string {
 >     : ^^^^^^
     }
     return "error";
->"error" : string
->        : ^^^^^^
+>"error" : "error"
+>        : ^^^^^^^
 }
 
 function isC1(c: C1 | C2 | C3): c is C1 { return c instanceof C1 }
@@ -179,8 +179,8 @@ function foo2(x: C1 | C2 | C3): string {
 >     : ^^^
     }
     return "error";
->"error" : string
->        : ^^^^^^
+>"error" : "error"
+>        : ^^^^^^^
 }
 
 // More tests
diff --git a/tests/baselines/reference/instantiateContextualTypes.types b/tests/baselines/reference/instantiateContextualTypes.types
index 614702d3c65..e51df99d1d8 100644
--- a/tests/baselines/reference/instantiateContextualTypes.types
+++ b/tests/baselines/reference/instantiateContextualTypes.types
@@ -85,16 +85,16 @@ new GenericComponent({ initialValues: 12, nextValues: val => 12 });
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^
 >initialValues : number
 >              : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >nextValues : (val: number) => number
 >           : ^   ^^^^^^^^^^^^^^^^^^^
 >val => 12 : (val: number) => number
 >          : ^   ^^^^^^^^^^^^^^^^^^^
 >val : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 // #22149
 
@@ -191,8 +191,8 @@ const defaultState: AppState = {
     dummy: ''
 >dummy : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 const NON_VOID_ACTION: ActionType<number> = 'NON_VOID_ACTION'
diff --git a/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types b/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types
index f8ea775baae..19a7e52635d 100644
--- a/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types
+++ b/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types
@@ -54,8 +54,8 @@ $.each(lines, function(dit) {
 >    : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.charAt(1) : string
 >               : ^^^^^^
 >this.charAt : (pos: number) => string
@@ -64,8 +64,8 @@ $.each(lines, function(dit) {
 >     : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
diff --git a/tests/baselines/reference/instantiateCrossFileMerge.types b/tests/baselines/reference/instantiateCrossFileMerge.types
index d421fe59e94..73b16139e6d 100644
--- a/tests/baselines/reference/instantiateCrossFileMerge.types
+++ b/tests/baselines/reference/instantiateCrossFileMerge.types
@@ -29,6 +29,6 @@ new P<string>(r => { r('foo') });
 >         : ^^^^
 >r : (value: string) => void
 >  : ^     ^^^^^^^^^^^^^    
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/instantiatedModule.types b/tests/baselines/reference/instantiatedModule.types
index 912acf08ecc..ac3ccdbe484 100644
--- a/tests/baselines/reference/instantiatedModule.types
+++ b/tests/baselines/reference/instantiatedModule.types
@@ -98,12 +98,12 @@ module M2 {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
     }
 }
diff --git a/tests/baselines/reference/interface0.types b/tests/baselines/reference/interface0.types
index cfc48eb5617..d7a725e41d3 100644
--- a/tests/baselines/reference/interface0.types
+++ b/tests/baselines/reference/interface0.types
@@ -14,6 +14,6 @@ var y: Generic<number> = { x: 3 };
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/interfaceAssignmentCompat.types b/tests/baselines/reference/interfaceAssignmentCompat.types
index d0b4d5a411d..f235305b6f4 100644
--- a/tests/baselines/reference/interfaceAssignmentCompat.types
+++ b/tests/baselines/reference/interfaceAssignmentCompat.types
@@ -257,16 +257,16 @@ module M {
         for (var j=z.length=1;j>=0;j--) {
 >j : number
 >  : ^^^^^^
->z.length=1 : number
->           : ^^^^^^
+>z.length=1 : 1
+>           : ^
 >z.length : number
 >         : ^^^^^^
 >z : IEye[]
 >  : ^^^^^^
 >length : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >j>=0 : boolean
 >     : ^^^^^^^
 >j : number
diff --git a/tests/baselines/reference/interfaceClassMerging.types b/tests/baselines/reference/interfaceClassMerging.types
index 3feab13a435..fec7f4f3108 100644
--- a/tests/baselines/reference/interfaceClassMerging.types
+++ b/tests/baselines/reference/interfaceClassMerging.types
@@ -46,8 +46,8 @@ class Foo {
 >     : ^^^^
 >method : (a: number) => string
 >       : ^ ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
@@ -91,8 +91,8 @@ bar.method(0);
 >    : ^^^
 >method : (a: number) => string
 >       : ^ ^^      ^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 bar.optionalMethod(1);
 >bar.optionalMethod(1) : string
@@ -103,8 +103,8 @@ bar.optionalMethod(1);
 >    : ^^^
 >optionalMethod : (a: number) => string
 >               : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 bar.property;
 >bar.property : string
@@ -139,8 +139,8 @@ bar.additionalMethod(2);
 >    : ^^^
 >additionalMethod : (a: number) => string
 >                 : ^ ^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var obj: {
 >obj : { method(a: number): string; property: string; additionalProperty: string; additionalMethod(a: number): string; }
diff --git a/tests/baselines/reference/interfaceDeclaration1.types b/tests/baselines/reference/interfaceDeclaration1.types
index fbc853b42ac..09a038b0654 100644
--- a/tests/baselines/reference/interfaceDeclaration1.types
+++ b/tests/baselines/reference/interfaceDeclaration1.types
@@ -75,8 +75,8 @@ class C1 implements I3 {
         var prototype: number = 3;
 >prototype : number
 >          : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/interfaceImplementation5.types b/tests/baselines/reference/interfaceImplementation5.types
index 78e8c1350d2..49b7721884c 100644
--- a/tests/baselines/reference/interfaceImplementation5.types
+++ b/tests/baselines/reference/interfaceImplementation5.types
@@ -36,8 +36,8 @@ class C3 implements I1 {
     public get getset1(){return 1;}
 >getset1 : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     public set getset1(baz:number){}
 >getset1 : number
diff --git a/tests/baselines/reference/interfaceImplementation6.types b/tests/baselines/reference/interfaceImplementation6.types
index a4e5d5f6cf2..10bebfbd215 100644
--- a/tests/baselines/reference/interfaceImplementation6.types
+++ b/tests/baselines/reference/interfaceImplementation6.types
@@ -47,8 +47,8 @@ export class Test {
 >            : ^^^^^^^^^^^^^^^^^
 >item : number
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 
diff --git a/tests/baselines/reference/interfaceImplementation7.types b/tests/baselines/reference/interfaceImplementation7.types
index 186c0193fcc..f27ad221109 100644
--- a/tests/baselines/reference/interfaceImplementation7.types
+++ b/tests/baselines/reference/interfaceImplementation7.types
@@ -29,7 +29,7 @@ class C1 implements i4 {
     public name(): string { return ""; }
 >name : () => string
 >     : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types
index 9b24536aa51..3f6f0bdc27c 100644
--- a/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types
+++ b/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types
@@ -32,8 +32,8 @@ var r2 = f('');
 >      : ^^^^^^
 >f : Foo
 >  : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r3 = new f();
 >r3 : any
@@ -48,6 +48,6 @@ var r4 = new f('');
 >          : ^^^^^^
 >f : Foo
 >  : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
index 203057be7d3..ebe5752bb6c 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -105,14 +105,14 @@ var a: Foo = {
     a: 1,
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     b: '',
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     c: true,
 >c : true
@@ -135,8 +135,8 @@ var a: Foo = {
 >  : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     g: {},
 >g : {}
@@ -151,8 +151,8 @@ var a: Foo = {
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     i: <T>(x: T) => x,
 >i : <T>(x: T) => T
diff --git a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
index f50995e0e0d..8f3e06807c8 100644
--- a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
+++ b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
@@ -38,8 +38,8 @@ var r2 = f('A');
 >f('A') : any
 >f : Foo
 >  : ^^^
->'A' : string
->    : ^^^^^^
+>'A' : "A"
+>    : ^^^
 
 var r3 = new f('a');
 >r3 : any
@@ -56,6 +56,6 @@ var r4 = new f('A');
 >           : ^^^^^^
 >f : Foo
 >  : ^^^
->'A' : string
->    : ^^^^^^
+>'A' : "A"
+>    : ^^^
 
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
index d612b8444f8..faca5b08b00 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
@@ -57,8 +57,8 @@ export module m2 {
 >      : ^
 >foo : (a: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
index 7a7fbbac2d3..3dac0b8cea3 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
@@ -57,7 +57,7 @@ export module m2 {
 >      : ^
 >foo : (a: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types
index f9c18d46821..fc0574857b2 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types
@@ -57,8 +57,8 @@ export module m2 {
 >      : ^
 >foo : (a: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
index 7ad761c2c30..8c862e5a4c4 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
@@ -49,6 +49,6 @@ var cReturnVal = cProp.foo(10);
 >      : ^^
 >foo : (a: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
index 9ecc16d7dec..4ca2c5b7c33 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
@@ -49,6 +49,6 @@ var cReturnVal = cProp.foo(10);
 >      : ^^
 >foo : (a: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types
index e51e2ad3f80..af821d35dd8 100644
--- a/tests/baselines/reference/internalAliasFunction.types
+++ b/tests/baselines/reference/internalAliasFunction.types
@@ -36,8 +36,8 @@ module c {
 >      : ^^^^^^
 >b : (x: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     export var bVal2 = b;
 >bVal2 : (x: number) => number
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
index 2882de999a0..d9fa6fa6825 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
@@ -36,8 +36,8 @@ export module c {
 >      : ^^^^^^
 >b : (x: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     export var bVal2 = b;
 >bVal2 : (x: number) => number
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
index eaa2fc7332f..ca8f0309f7e 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
@@ -36,8 +36,8 @@ export module c {
 >      : ^^^^^^
 >b : (x: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     export var bVal2 = b;
 >bVal2 : (x: number) => number
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types
index 99421f6d6c0..a685078e749 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types
@@ -36,8 +36,8 @@ export module c {
 >      : ^^^^^^
 >b : (x: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     export var bVal2 = b;
 >bVal2 : (x: number) => number
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
index 8c8aa690291..4bd64b7cc6a 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
@@ -32,8 +32,8 @@ export var bVal = b(10);
 >      : ^^^^^^
 >b : (x: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 export var bVal2 = b;
 >bVal2 : (x: number) => number
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
index 611b55d0e0d..cfeefa7fa10 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
@@ -32,8 +32,8 @@ export var bVal = b(10);
 >      : ^^^^^^
 >b : (x: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 export var bVal2 = b;
 >bVal2 : (x: number) => number
diff --git a/tests/baselines/reference/intersectionAsWeakTypeSource.types b/tests/baselines/reference/intersectionAsWeakTypeSource.types
index 5a609c276dc..4d1f97cfc83 100644
--- a/tests/baselines/reference/intersectionAsWeakTypeSource.types
+++ b/tests/baselines/reference/intersectionAsWeakTypeSource.types
@@ -24,12 +24,12 @@ const xy: XY = {x: 'x', y: 10};
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'x' : string
->    : ^^^^^^
+>'x' : "x"
+>    : ^^^
 >y : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 const z1: Z = xy; // error, {xy} doesn't overlap with {z}
 >z1 : Z
@@ -76,12 +76,12 @@ const wrapped = create({ first: { view: 0, styleMedia: "???" } });
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >view : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >styleMedia : string
 >           : ^^^^^^
->"???" : string
->      : ^^^^^^
+>"???" : "???"
+>      : ^^^^^
 
 const vs: ViewStyle = wrapped.first // error, first is a branded number
 >vs : ViewStyle
diff --git a/tests/baselines/reference/intersectionPropertyCheck.types b/tests/baselines/reference/intersectionPropertyCheck.types
index 09f036e3f4a..556b332d603 100644
--- a/tests/baselines/reference/intersectionPropertyCheck.types
+++ b/tests/baselines/reference/intersectionPropertyCheck.types
@@ -18,16 +18,16 @@ let obj: { a: { x: string } } & { c: number } = { a: { x: 'hello', y: 2 }, c: 5
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >y : number
 >  : ^^^^^^
 >2 : 2
 >  : ^
 >c : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 declare let wrong: { a: { y: string } };
 >wrong : { a: { y: string; }; }
diff --git a/tests/baselines/reference/intersectionSatisfiesConstraint.types b/tests/baselines/reference/intersectionSatisfiesConstraint.types
index 15a278accc5..83cb4a695a1 100644
--- a/tests/baselines/reference/intersectionSatisfiesConstraint.types
+++ b/tests/baselines/reference/intersectionSatisfiesConstraint.types
@@ -40,8 +40,8 @@ const myFirstFunction = <T extends FirstInterface | SecondInterface>(param1: T)
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >otherProperty : number
 >              : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     mySecondFunction(newParam)
 >mySecondFunction(newParam) : { commonProperty: number; otherProperty: number; }
diff --git a/tests/baselines/reference/intersectionThisTypes.types b/tests/baselines/reference/intersectionThisTypes.types
index aa905ecce16..b3cca39f4f8 100644
--- a/tests/baselines/reference/intersectionThisTypes.types
+++ b/tests/baselines/reference/intersectionThisTypes.types
@@ -168,16 +168,16 @@ function test(label: Label) {
 >           : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->67 : number
->   : ^^^^^^
+>67 : 67
+>   : ^^
 >extend : <T>(props: T) => Label & { id: number; } & T
 >       : ^ ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ tag: "hello" } : { tag: string; }
 >                 : ^^^^^^^^^^^^^^^^
 >tag : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     extended.id;  // Ok
 >extended.id : number
diff --git a/tests/baselines/reference/intersectionTypeInference.types b/tests/baselines/reference/intersectionTypeInference.types
index 38ed7d7eb82..6b946847277 100644
--- a/tests/baselines/reference/intersectionTypeInference.types
+++ b/tests/baselines/reference/intersectionTypeInference.types
@@ -61,14 +61,14 @@ var x = extend({ a: "hello" }, { b: 42 });
 >               : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ b: 42 } : { b: number; }
 >          : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var s = x.a;
 >s : string
@@ -124,12 +124,12 @@ var z = foo({ a: "hello", b: 42 });
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >b : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var z: string | number;
 >z : string | number
diff --git a/tests/baselines/reference/intersectionTypeInference1.types b/tests/baselines/reference/intersectionTypeInference1.types
index 48bcd5e1e4e..63f9439e7f2 100644
--- a/tests/baselines/reference/intersectionTypeInference1.types
+++ b/tests/baselines/reference/intersectionTypeInference1.types
@@ -62,6 +62,6 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"})
 >                 : ^^^^^^^^^^^^^^^^^^
 >store : string
 >      : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/intersectionTypeMembers.types b/tests/baselines/reference/intersectionTypeMembers.types
index 58f4824cd1f..5c029e60b75 100644
--- a/tests/baselines/reference/intersectionTypeMembers.types
+++ b/tests/baselines/reference/intersectionTypeMembers.types
@@ -21,40 +21,40 @@ var abc: A & B & C;
 >    : ^^^^^^^^^
 
 abc.a = "hello";
->abc.a = "hello" : string
->                : ^^^^^^
+>abc.a = "hello" : "hello"
+>                : ^^^^^^^
 >abc.a : string
 >      : ^^^^^^
 >abc : A & B & C
 >    : ^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 abc.b = "hello";
->abc.b = "hello" : string
->                : ^^^^^^
+>abc.b = "hello" : "hello"
+>                : ^^^^^^^
 >abc.b : string
 >      : ^^^^^^
 >abc : A & B & C
 >    : ^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 abc.c = "hello";
->abc.c = "hello" : string
->                : ^^^^^^
+>abc.c = "hello" : "hello"
+>                : ^^^^^^^
 >abc.c : string
 >      : ^^^^^^
 >abc : A & B & C
 >    : ^^^^^^^^^
 >c : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 interface X { x: A }
 >x : A
@@ -73,8 +73,8 @@ var xyz: X & Y & Z;
 >    : ^^^^^^^^^
 
 xyz.x.a = "hello";
->xyz.x.a = "hello" : string
->                  : ^^^^^^
+>xyz.x.a = "hello" : "hello"
+>                  : ^^^^^^^
 >xyz.x.a : string
 >        : ^^^^^^
 >xyz.x : A & B & C
@@ -85,12 +85,12 @@ xyz.x.a = "hello";
 >  : ^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 xyz.x.b = "hello";
->xyz.x.b = "hello" : string
->                  : ^^^^^^
+>xyz.x.b = "hello" : "hello"
+>                  : ^^^^^^^
 >xyz.x.b : string
 >        : ^^^^^^
 >xyz.x : A & B & C
@@ -101,12 +101,12 @@ xyz.x.b = "hello";
 >  : ^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 xyz.x.c = "hello";
->xyz.x.c = "hello" : string
->                  : ^^^^^^
+>xyz.x.c = "hello" : "hello"
+>                  : ^^^^^^^
 >xyz.x.c : string
 >        : ^^^^^^
 >xyz.x : A & B & C
@@ -117,8 +117,8 @@ xyz.x.c = "hello";
 >  : ^^^^^^^^^
 >c : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 type F1 = (x: string) => string;
 >F1 : F1
@@ -143,8 +143,8 @@ var s = f("hello");
 >           : ^^^^^^
 >f : F1 & F2
 >  : ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var n = f(42);
 >n : number
@@ -153,8 +153,8 @@ var n = f(42);
 >      : ^^^^^^
 >f : F1 & F2
 >  : ^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 interface D {
     nested: { doublyNested: { d: string; }, different: { e: number } };
@@ -203,14 +203,14 @@ const de: D & E = {
             d: 'yes',
 >d : string
 >  : ^^^^^^
->'yes' : string
->      : ^^^^^^
+>'yes' : "yes"
+>      : ^^^^^
 
             f: 'no'
 >f : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
         },
         different: { e: 12 },
@@ -220,8 +220,8 @@ const de: D & E = {
 >          : ^^^^^^^^^^^^^^
 >e : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
         other: { g: 101 }
 >other : { g: number; }
@@ -230,8 +230,8 @@ const de: D & E = {
 >           : ^^^^^^^^^^^^^^
 >g : number
 >  : ^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
     }
 }
 
@@ -277,26 +277,26 @@ const defg: D & E & F & G = {
             d: 'yes',
 >d : string
 >  : ^^^^^^
->'yes' : string
->      : ^^^^^^
+>'yes' : "yes"
+>      : ^^^^^
 
             f: 'no',
 >f : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
             g: 'ok',
 >g : string
 >  : ^^^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 
             h: 'affirmative'
 >h : string
 >  : ^^^^^^
->'affirmative' : string
->              : ^^^^^^
+>'affirmative' : "affirmative"
+>              : ^^^^^^^^^^^^^
 
         },
         different: { e: 12 },
@@ -306,8 +306,8 @@ const defg: D & E & F & G = {
 >          : ^^^^^^^^^^^^^^
 >e : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
         other: { g: 101 }
 >other : { g: number; }
@@ -316,8 +316,8 @@ const defg: D & E & F & G = {
 >           : ^^^^^^^^^^^^^^
 >g : number
 >  : ^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/intersectionTypeOverloading.types b/tests/baselines/reference/intersectionTypeOverloading.types
index bd3674920ff..630f382e7fe 100644
--- a/tests/baselines/reference/intersectionTypeOverloading.types
+++ b/tests/baselines/reference/intersectionTypeOverloading.types
@@ -30,8 +30,8 @@ var x = fg("abc");
 >          : ^^^^^^
 >fg : F & G
 >   : ^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 var x: string;
 >x : string
diff --git a/tests/baselines/reference/intersectionTypeReadonly.types b/tests/baselines/reference/intersectionTypeReadonly.types
index 50fccd1bb20..003a28d8181 100644
--- a/tests/baselines/reference/intersectionTypeReadonly.types
+++ b/tests/baselines/reference/intersectionTypeReadonly.types
@@ -63,16 +63,16 @@ let mutable: Base & Mutable;
 >        : ^^^^^^^^^^^^^^
 
 mutable.value = 12;
->mutable.value = 12 : number
->                   : ^^^^^^
+>mutable.value = 12 : 12
+>                   : ^^
 >mutable.value : number
 >              : ^^^^^^
 >mutable : Base & Mutable
 >        : ^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 let differentType: Base & DifferentType;
 >differentType : Base & DifferentType
diff --git a/tests/baselines/reference/intersectionType_useDefineForClassFields.types b/tests/baselines/reference/intersectionType_useDefineForClassFields.types
index e2de3c23b59..5a189ee69cd 100644
--- a/tests/baselines/reference/intersectionType_useDefineForClassFields.types
+++ b/tests/baselines/reference/intersectionType_useDefineForClassFields.types
@@ -29,6 +29,6 @@ class Baz extends bar({ x: 1 }) {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
diff --git a/tests/baselines/reference/intersectionWithIndexSignatures.types b/tests/baselines/reference/intersectionWithIndexSignatures.types
index 2863e6e4a30..b95345006db 100644
--- a/tests/baselines/reference/intersectionWithIndexSignatures.types
+++ b/tests/baselines/reference/intersectionWithIndexSignatures.types
@@ -130,8 +130,8 @@ q["asd"].a.substr(1);
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 q["asd"].b;  // Error
 >q["asd"].b : any
diff --git a/tests/baselines/reference/intersectionsAndEmptyObjects.types b/tests/baselines/reference/intersectionsAndEmptyObjects.types
index 65521b04036..79436aeb13b 100644
--- a/tests/baselines/reference/intersectionsAndEmptyObjects.types
+++ b/tests/baselines/reference/intersectionsAndEmptyObjects.types
@@ -332,7 +332,7 @@ mock(import('./ex'))
 >     : ^ ^^ ^^          ^^^^^      
 >import('./ex') : Promise<{ default: typeof import("ex"); }>
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./ex' : string
+>'./ex' : "./ex"
 >       : ^^^^^^
 
 === ex.d.ts ===
diff --git a/tests/baselines/reference/intersectionsAndOptionalProperties.types b/tests/baselines/reference/intersectionsAndOptionalProperties.types
index 7981b3ca3dd..2b551b8f54d 100644
--- a/tests/baselines/reference/intersectionsAndOptionalProperties.types
+++ b/tests/baselines/reference/intersectionsAndOptionalProperties.types
@@ -101,8 +101,8 @@ const yy: number[] & [number, ...number[]] = [1];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const xx: [number, ...number[]] = yy;
 >xx : [number, ...number[]]
diff --git a/tests/baselines/reference/intersectionsAndReadonlyProperties.types b/tests/baselines/reference/intersectionsAndReadonlyProperties.types
index b1bdf3eb71f..a0052106620 100644
--- a/tests/baselines/reference/intersectionsAndReadonlyProperties.types
+++ b/tests/baselines/reference/intersectionsAndReadonlyProperties.types
@@ -15,16 +15,16 @@ declare let i1: Intersection1;
 >   : ^^^^^^^^^^^^^
 
 i1.a = 2;
->i1.a = 2 : number
->         : ^^^^^^
+>i1.a = 2 : 2
+>         : ^
 >i1.a : number
 >     : ^^^^^^
 >i1 : Intersection1
 >   : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 // getter and setter
 type Intersection2 = { get a(): number } & { set a(v: number) };
@@ -42,16 +42,16 @@ declare let i2: Intersection2;
 >   : ^^^^^^^^^^^^^
 
 i2.a = 2;
->i2.a = 2 : number
->         : ^^^^^^
+>i2.a = 2 : 2
+>         : ^
 >i2.a : number
 >     : ^^^^^^
 >i2 : Intersection2
 >   : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 // assignment to an all read-only property should still be disallowed
 type IntersectionAllReadonly = { readonly a: number } & { get a(): number };
diff --git a/tests/baselines/reference/intlNumberFormatES2020.types b/tests/baselines/reference/intlNumberFormatES2020.types
index 74278a7ae19..b58ed0767a9 100644
--- a/tests/baselines/reference/intlNumberFormatES2020.types
+++ b/tests/baselines/reference/intlNumberFormatES2020.types
@@ -57,7 +57,7 @@ new Intl.NumberFormat('en-NZ', { numberingSystem: 'arab' });
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >numberingSystem : string
 >                : ^^^^^^
->'arab' : string
+>'arab' : "arab"
 >       : ^^^^^^
 
 // Currency
@@ -88,8 +88,8 @@ const { currency, currencySign } = new Intl.NumberFormat('en-NZ', { style: 'curr
 >           : ^^^^^^^^^^
 >currency : string
 >         : ^^^^^^
->'NZD' : string
->      : ^^^^^^
+>'NZD' : "NZD"
+>      : ^^^^^
 >currencySign : "accounting"
 >             : ^^^^^^^^^^^^
 >'accounting' : "accounting"
@@ -125,8 +125,8 @@ const { unit, unitDisplay } = new Intl.NumberFormat('en-NZ', { style: 'unit', un
 >       : ^^^^^^
 >unit : string
 >     : ^^^^^^
->'kilogram' : string
->           : ^^^^^^
+>'kilogram' : "kilogram"
+>           : ^^^^^^^^^^
 >unitDisplay : "narrow"
 >            : ^^^^^^^^
 >'narrow' : "narrow"
diff --git a/tests/baselines/reference/intraExpressionInferences.types b/tests/baselines/reference/intraExpressionInferences.types
index 8fd1062f935..7078c2603be 100644
--- a/tests/baselines/reference/intraExpressionInferences.types
+++ b/tests/baselines/reference/intraExpressionInferences.types
@@ -36,8 +36,8 @@ callIt({
 >        : ^^^^^^^^^^^^
 >() => 0 : () => number
 >        : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     consume: n => n.toFixed()
 >consume : (n: number) => string
@@ -72,8 +72,8 @@ callIt({
 >        : ^  ^^^^^^^^^^^^^^^^^^^
 >_a : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     consume: n => n.toFixed(),
 >consume : (n: number) => string
@@ -106,8 +106,8 @@ callIt({
 >        : ^^^^^^^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     },
     consume: n => n.toFixed()
@@ -147,8 +147,8 @@ callItT([() => 0, n => n.toFixed()]);
 >                            : ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
 >() => 0 : () => number
 >        : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >n => n.toFixed() : (n: number) => string
 >                 : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
@@ -173,8 +173,8 @@ callItT([_a => 0, n => n.toFixed()]);
 >        : ^  ^^^^^^^^^^^^^^^^^^^
 >_a : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >n => n.toFixed() : (n: number) => string
 >                 : ^ ^^^^^^^^^^^^^^^^^^^
 >n : number
@@ -231,8 +231,8 @@ const myGeneric = inferTypeFn({
 >               : ^         ^^^^^^^^^^^^^^^^^^^
 >parameter : string
 >          : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
     operateWithGeneric: generic => generic.toFixed()
 >operateWithGeneric : (generic: number) => string
@@ -430,8 +430,8 @@ test({
 >  : ^^^^^^^^^^^^
 >() => 0 : () => number
 >        : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b: (a) => 'a',
 >b : (a: number) => string
@@ -440,8 +440,8 @@ test({
 >           : ^ ^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
     c: (b) => {
 >c : (b: string) => void
@@ -472,8 +472,8 @@ test({
 >  : ^^^^^^^^^^^^
 >() => 0 : () => number
 >        : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b: (a) => a,
 >b : (a: number) => number
@@ -696,8 +696,8 @@ simplified({ generator: () => 123, receiver: (t) => console.log(t + 2) })
 >          : ^^^^^^^^^^^^
 >() => 123 : () => number
 >          : ^^^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 >receiver : (t: number) => void
 >         : ^ ^^^^^^^^^^^^^^^^^
 >(t) => console.log(t + 2) : (t: number) => void
@@ -840,8 +840,8 @@ function example<TParams, TDone, TMapped>(options: Opts<TParams, TDone, TMapped>
 >      : ^      ^^^^^^^^^^^   ^^      ^^^^^^^^^^
 >params : TParams
 >       : ^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
         return options.map(data)
 >options.map(data) : TMapped
@@ -882,8 +882,8 @@ example({
 >                        : ^      ^^      ^^^^^^^^^^^
 >params : Params
 >       : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     map: (number) => String(number)
 >map : (number: number) => string
@@ -918,8 +918,8 @@ example({
 >       : ^^^^^^
 >foo : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     map: (number) => String(number)
 >map : (number: number) => string
@@ -954,8 +954,8 @@ example({
 >       : ^^^^^^
 >foo : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     map: (number) => String(number)
 >map : (number: number) => string
@@ -1080,8 +1080,8 @@ Foo({
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     b: (arg) => {
 >b : (arg: number) => void
@@ -1173,8 +1173,8 @@ const resNested = nested({
 >    : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"," : string
->    : ^^^^^^
+>"," : ","
+>    : ^^^
 
   },
 });
@@ -1504,8 +1504,8 @@ const resOnion = onion({
 >    : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"," : string
->    : ^^^^^^
+>"," : ","
+>    : ^^^
 
     nested2: {
 >nested2 : { c: (arg: string) => boolean; }
@@ -1616,8 +1616,8 @@ const resOnion2 = onion2({
 >    : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"," : string
->    : ^^^^^^
+>"," : ","
+>    : ^^^
 
     c: (arg) => Number(arg),
 >c : (arg: string[]) => number
@@ -1727,8 +1727,8 @@ const distantRes = distant({
 >           : ^   ^^^^^^^^^^^^^^^^^^^
 >arg : string
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
       },
     },
diff --git a/tests/baselines/reference/intraExpressionInferencesJsx.types b/tests/baselines/reference/intraExpressionInferencesJsx.types
index 842384d5e04..194a4452b00 100644
--- a/tests/baselines/reference/intraExpressionInferencesJsx.types
+++ b/tests/baselines/reference/intraExpressionInferencesJsx.types
@@ -137,8 +137,8 @@ const Component = <T extends Animations>({
       value: 1,
 >value : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
       a: true,
 >a : true
@@ -157,8 +157,8 @@ const Component = <T extends Animations>({
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   }}
 />;
@@ -189,8 +189,8 @@ const Component = <T extends Animations>({
       value: 1,
 >value : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
       a: true,
 >a : true
@@ -225,8 +225,8 @@ const Component = <T extends Animations>({
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   }}
 />;
@@ -257,8 +257,8 @@ const Component = <T extends Animations>({
       value: 1,
 >value : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
       a: true,
 >a : true
@@ -295,8 +295,8 @@ const Component = <T extends Animations>({
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   }}
 />;
@@ -341,8 +341,8 @@ function Foo<T>(props: Props<T>) {
 >  : ^^^^^^^^^^^^
 >() => 10 : () => number
 >         : ^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
   b={(arg) => { arg.toString(); }}
 >b : (arg: number) => void
@@ -375,8 +375,8 @@ function Foo<T>(props: Props<T>) {
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
   b={(arg) => { arg.toString(); }}
 >b : (arg: number) => void
@@ -411,8 +411,8 @@ function Foo<T>(props: Props<T>) {
 >          : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
   b: (arg) => { arg.toString(); },
 >b : (arg: number) => void
diff --git a/tests/baselines/reference/intrinsicKeyword.types b/tests/baselines/reference/intrinsicKeyword.types
index f5ce64274e7..ae043729da5 100644
--- a/tests/baselines/reference/intrinsicKeyword.types
+++ b/tests/baselines/reference/intrinsicKeyword.types
@@ -64,7 +64,7 @@ function f3() {
     let s1: intrinsic = 'ok';
 >s1 : string
 >   : ^^^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 }
 
diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.types b/tests/baselines/reference/invalidModuleWithVarStatements.types
index c371c3eda66..69b2289918f 100644
--- a/tests/baselines/reference/invalidModuleWithVarStatements.types
+++ b/tests/baselines/reference/invalidModuleWithVarStatements.types
@@ -10,8 +10,8 @@ module Y {
     public var x: number = 0;
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 module Y2 {
@@ -32,8 +32,8 @@ module Y4 {
     static var x: number = 0;
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 module YY {
@@ -54,8 +54,8 @@ module YY2 {
     private var x: number = 0;
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 
diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.types b/tests/baselines/reference/invalidMultipleVariableDeclarations.types
index d3a35966925..cfd5df0fbf4 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.types
@@ -53,8 +53,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 module M {
 >M : typeof M
diff --git a/tests/baselines/reference/invalidReturnStatements.types b/tests/baselines/reference/invalidReturnStatements.types
index 08153899211..4ef1888905b 100644
--- a/tests/baselines/reference/invalidReturnStatements.types
+++ b/tests/baselines/reference/invalidReturnStatements.types
@@ -55,8 +55,8 @@ function fn10(): D { return { id: 12 }; }
 >           : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 function fn11(): D { return new C(); }
 >fn11 : () => D
diff --git a/tests/baselines/reference/invalidSplice.types b/tests/baselines/reference/invalidSplice.types
index b780f173be3..7d436e88051 100644
--- a/tests/baselines/reference/invalidSplice.types
+++ b/tests/baselines/reference/invalidSplice.types
@@ -12,10 +12,10 @@ var arr = [].splice(0,3,4,5);
 >   : ^^^^^^^^^^^
 >splice : { (start: number, deleteCount?: number): any[]; (start: number, deleteCount: number, ...items: any[]): any[]; }
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>3 : 3
+>  : ^
 >4 : 4
 >  : ^
 >5 : 5
diff --git a/tests/baselines/reference/invocationExpressionInFunctionParameter.types b/tests/baselines/reference/invocationExpressionInFunctionParameter.types
index 81866c5adf4..413c6205a43 100644
--- a/tests/baselines/reference/invocationExpressionInFunctionParameter.types
+++ b/tests/baselines/reference/invocationExpressionInFunctionParameter.types
@@ -16,6 +16,6 @@ function foo3(x = foo1(123)) { //should error, 123 is not string
 >          : ^^^^
 >foo1 : (val: string) => void
 >     : ^   ^^      ^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 }
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index 6775d34d319..c1aa41840d6 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -120,8 +120,8 @@ var p2 = p.then(function (s) {
 >  : ^^^^^^
 
     return 34;
->34 : number
->   : ^^^^^^
+>34 : 34
+>   : ^^
 
 } );
 
diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types
index 7a0e7ccc485..46e5e4a020e 100644
--- a/tests/baselines/reference/ipromise4.types
+++ b/tests/baselines/reference/ipromise4.types
@@ -130,8 +130,8 @@ p.then(function (x) { return "hello"; } ).then(function (x) { return x } ); // s
 >                                 : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >then : { <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >     : ^^^ ^^       ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^^^     ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^       ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^^^     ^^   ^^^^^^^^        ^^^                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^       ^^^^     ^^^^^^^^^^^^^^^^     ^^^^     ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^       ^^^^     ^^^^^^^^^^^^^^^^     ^^^^     ^^   ^^^^^^^^        ^^^                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (x) { return x } : (x: string) => string
diff --git a/tests/baselines/reference/isLiteral1.types b/tests/baselines/reference/isLiteral1.types
index 2b152e0bf42..7a6bd62378a 100644
--- a/tests/baselines/reference/isLiteral1.types
+++ b/tests/baselines/reference/isLiteral1.types
@@ -4,6 +4,6 @@
 var x: number = 02343;
 >x : number
 >  : ^^^^^^
->02343 : number
->      : ^^^^^^
+>02343 : 1251
+>      : ^^^^
 
diff --git a/tests/baselines/reference/isolatedDeclarationErrorsClasses.types b/tests/baselines/reference/isolatedDeclarationErrorsClasses.types
index 76768902b38..aa310b6119e 100644
--- a/tests/baselines/reference/isolatedDeclarationErrorsClasses.types
+++ b/tests/baselines/reference/isolatedDeclarationErrorsClasses.types
@@ -72,8 +72,8 @@ export class Cls {
     get getSetOk(): number { return 0 }
 >getSetOk : number
 >         : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set getSetOk(value) { }
 >getSetOk : number
@@ -84,8 +84,8 @@ export class Cls {
     get getSetOk2() { return 0 }
 >getSetOk2 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set getSetOk2(value: number) { }
 >getSetOk2 : number
@@ -96,8 +96,8 @@ export class Cls {
     get getSetOk3(): number { return 0 }
 >getSetOk3 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set getSetOk3(value: number) { }
 >getSetOk3 : number
@@ -109,14 +109,14 @@ export class Cls {
 let noAnnotationStringName: string = "noAnnotationStringName";
 >noAnnotationStringName : string
 >                       : ^^^^^^
->"noAnnotationStringName" : string
->                         : ^^^^^^
+>"noAnnotationStringName" : "noAnnotationStringName"
+>                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 let noParamAnnotationStringName: string = "noParamAnnotationStringName";
 >noParamAnnotationStringName : string
 >                            : ^^^^^^
->"noParamAnnotationStringName" : string
->                              : ^^^^^^
+>"noParamAnnotationStringName" : "noParamAnnotationStringName"
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 const noAnnotationLiteralName = "noAnnotationLiteralName";
 >noAnnotationLiteralName : "noAnnotationLiteralName"
diff --git a/tests/baselines/reference/isolatedDeclarationErrorsClassesExpressions.types b/tests/baselines/reference/isolatedDeclarationErrorsClassesExpressions.types
index 6e614b795ec..f35c5915cf8 100644
--- a/tests/baselines/reference/isolatedDeclarationErrorsClassesExpressions.types
+++ b/tests/baselines/reference/isolatedDeclarationErrorsClassesExpressions.types
@@ -10,8 +10,8 @@ export const cls = class {
     foo: string = "";
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 
diff --git a/tests/baselines/reference/isolatedDeclarationErrorsEnums.types b/tests/baselines/reference/isolatedDeclarationErrorsEnums.types
index 64412b627a0..26fbe48b815 100644
--- a/tests/baselines/reference/isolatedDeclarationErrorsEnums.types
+++ b/tests/baselines/reference/isolatedDeclarationErrorsEnums.types
@@ -18,8 +18,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     B = computed(1),
 >B : E.B
@@ -28,8 +28,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     C = computed(2),
 >C : E.C
@@ -38,8 +38,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     D = computed(3),
 >D : E.D
@@ -48,8 +48,8 @@ enum E {
 >            : ^^^^^^
 >computed : (x: number) => number
 >         : ^ ^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 }
 
 
diff --git a/tests/baselines/reference/isolatedDeclarationErrorsExpressions.types b/tests/baselines/reference/isolatedDeclarationErrorsExpressions.types
index e02bd8d57bf..0a32e4b747e 100644
--- a/tests/baselines/reference/isolatedDeclarationErrorsExpressions.types
+++ b/tests/baselines/reference/isolatedDeclarationErrorsExpressions.types
@@ -899,16 +899,16 @@ export const [, , b = 1]: [number, number, number | undefined] = [0, 1, 2];
 > : ^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[0, 1, 2] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 export function foo([, , b]: [
 >foo : ([, , b]?: [number, number, number]) => void
@@ -926,11 +926,11 @@ export function foo([, , b]: [
 ] = [0, 1, 2]): void {
 >[0, 1, 2] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 }
diff --git a/tests/baselines/reference/isolatedDeclarationErrorsObjects.types b/tests/baselines/reference/isolatedDeclarationErrorsObjects.types
index 8a4a516766d..5eff377c54e 100644
--- a/tests/baselines/reference/isolatedDeclarationErrorsObjects.types
+++ b/tests/baselines/reference/isolatedDeclarationErrorsObjects.types
@@ -186,8 +186,8 @@ export let oWithAccessor = {
     get getSetOk(): number { return 0 },
 >getSetOk : number
 >         : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set getSetOk(value) { },
 >getSetOk : number
@@ -198,8 +198,8 @@ export let oWithAccessor = {
     get getSetOk2() { return 0 },
 >getSetOk2 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set getSetOk2(value: number) { },
 >getSetOk2 : number
@@ -210,8 +210,8 @@ export let oWithAccessor = {
     get getSetOk3(): number { return 0 },
 >getSetOk3 : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set getSetOk3(value: number) { },
 >getSetOk3 : number
@@ -239,8 +239,8 @@ const s: unique symbol = Symbol();
 const str: string = "";
 >str : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 enum E {
 >E : E
diff --git a/tests/baselines/reference/isolatedDeclarationErrorsReturnTypes.types b/tests/baselines/reference/isolatedDeclarationErrorsReturnTypes.types
index 502da90c9d5..0b92f32e31e 100644
--- a/tests/baselines/reference/isolatedDeclarationErrorsReturnTypes.types
+++ b/tests/baselines/reference/isolatedDeclarationErrorsReturnTypes.types
@@ -64,8 +64,8 @@ export const fnExpressionConstVariableOk = function foo(): number { return 0;}
 >                                    : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export const fnArrowConstVariableOk = (cb = function(){ }): string => "S";
 >fnArrowConstVariableOk : (cb?: () => void) => string
@@ -76,8 +76,8 @@ export const fnArrowConstVariableOk = (cb = function(){ }): string => "S";
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export let fnExpressionLetVariableOk = function foo(): number { return 0;}
 >fnExpressionLetVariableOk : () => number
@@ -86,8 +86,8 @@ export let fnExpressionLetVariableOk = function foo(): number { return 0;}
 >                                    : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export let fnArrowLetVariableOk = (cb = function(){ }): string => "S";
 >fnArrowLetVariableOk : (cb?: () => void) => string
@@ -98,8 +98,8 @@ export let fnArrowLetVariableOk = (cb = function(){ }): string => "S";
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export var fnExpressionVarVariableOk = function foo(): number { return 0;}
 >fnExpressionVarVariableOk : () => number
@@ -108,8 +108,8 @@ export var fnExpressionVarVariableOk = function foo(): number { return 0;}
 >                                    : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export var fnArrowVarVariableOk = (cb = function(){ }): string => "S";
 >fnArrowVarVariableOk : (cb?: () => void) => string
@@ -120,8 +120,8 @@ export var fnArrowVarVariableOk = (cb = function(){ }): string => "S";
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 // Not exported
 const fnExpressionConstVariableInternal = function foo() { return 0;}
@@ -264,16 +264,16 @@ export class ExportedClass {
 >                                     : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     fnArrowOK = (): string => "S";
 >fnArrowOK : () => string
 >          : ^^^^^^      
 >(): string => "S" : () => string
 >                  : ^^^^^^      
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     protected fnExpressionProtectedOk = function foo(): number { return 0; }
 >fnExpressionProtectedOk : () => number
@@ -282,16 +282,16 @@ export class ExportedClass {
 >                                     : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected fnArrowProtectedOK = (): string => "S";
 >fnArrowProtectedOK : () => string
 >                   : ^^^^^^      
 >(): string => "S" : () => string
 >                  : ^^^^^^      
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     static fnStaticExpressionOk = function foo(): number { return 0; }
 >fnStaticExpressionOk : () => number
@@ -300,16 +300,16 @@ export class ExportedClass {
 >                                     : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static fnStaticArrowOk = (): string => "S";
 >fnStaticArrowOk : () => string
 >                : ^^^^^^      
 >(): string => "S" : () => string
 >                  : ^^^^^^      
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     protected static fnStaticExpressionProtectedOk = function foo(): number { return 0; }    
 >fnStaticExpressionProtectedOk : () => number
@@ -318,16 +318,16 @@ export class ExportedClass {
 >                                     : ^^^^^^      
 >foo : () => number
 >    : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected static fnStaticArrowProtectedOk = (): string => "S";
 >fnStaticArrowProtectedOk : () => string
 >                         : ^^^^^^      
 >(): string => "S" : () => string
 >                  : ^^^^^^      
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
     
 
     // No Error not in declarations
@@ -728,8 +728,8 @@ export const fnParamExpressionConstVariableOwnerHasReturnType = function foo(cb
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export const fnParamArrowConstVariableOwnerHasReturnType = (cb = function(){ }): string => "S";
 >fnParamArrowConstVariableOwnerHasReturnType : (cb?: () => void) => string
@@ -740,8 +740,8 @@ export const fnParamArrowConstVariableOwnerHasReturnType = (cb = function(){ }):
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export let fnParamExpressionLetVariableOwnerHasReturnType = function foo(cb = function(){ }): number { return 0;}
 >fnParamExpressionLetVariableOwnerHasReturnType : (cb?: () => void) => number
@@ -754,8 +754,8 @@ export let fnParamExpressionLetVariableOwnerHasReturnType = function foo(cb = fu
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export let fnParamArrowLetVariableOwnerHasReturnType = (cb = function(){ }): string => "S";
 >fnParamArrowLetVariableOwnerHasReturnType : (cb?: () => void) => string
@@ -766,8 +766,8 @@ export let fnParamArrowLetVariableOwnerHasReturnType = (cb = function(){ }): str
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export var fnParamExpressionVarVariableOwnerHasReturnType = function foo(cb = function(){ }): number { return 0;}
 >fnParamExpressionVarVariableOwnerHasReturnType : (cb?: () => void) => number
@@ -780,8 +780,8 @@ export var fnParamExpressionVarVariableOwnerHasReturnType = function foo(cb = fu
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export var fnParamArrowVarVariableOwnerHasReturnType = (cb = function(){ }): string => "S";
 >fnParamArrowVarVariableOwnerHasReturnType : (cb?: () => void) => string
@@ -792,8 +792,8 @@ export var fnParamArrowVarVariableOwnerHasReturnType = (cb = function(){ }): str
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 // No Errors
 export const fnParamExpressionConstVariableOk = function foo(cb = function(): void{ }): number { return 0;}
@@ -807,8 +807,8 @@ export const fnParamExpressionConstVariableOk = function foo(cb = function(): vo
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export const fnParamArrowConstVariableOk = (cb = function(): void{ }): string => "S";
 >fnParamArrowConstVariableOk : (cb?: () => void) => string
@@ -819,8 +819,8 @@ export const fnParamArrowConstVariableOk = (cb = function(): void{ }): string =>
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export let fnParamExpressionLetVariableOk = function foo(cb = function(): void{ }): number { return 0;}
 >fnParamExpressionLetVariableOk : (cb?: () => void) => number
@@ -833,8 +833,8 @@ export let fnParamExpressionLetVariableOk = function foo(cb = function(): void{
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export let fnParamArrowLetVariableOk = (cb = function(): void{ }): string => "S";
 >fnParamArrowLetVariableOk : (cb?: () => void) => string
@@ -845,8 +845,8 @@ export let fnParamArrowLetVariableOk = (cb = function(): void{ }): string => "S"
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export var fnParamExpressionVarVariableOk = function foo(cb = function(): void{ }): number { return 0;}
 >fnParamExpressionVarVariableOk : (cb?: () => void) => number
@@ -859,8 +859,8 @@ export var fnParamExpressionVarVariableOk = function foo(cb = function(): void{
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export var fnParamArrowVarVariableOk = (cb = function(): void{ }): string => "S";
 >fnParamArrowVarVariableOk : (cb?: () => void) => string
@@ -871,8 +871,8 @@ export var fnParamArrowVarVariableOk = (cb = function(): void{ }): string => "S"
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
 export const fnParamExpressionConstVariableInternal = function foo(cb = function(){ }) { return 0;}
 >fnParamExpressionConstVariableInternal : (cb?: () => void) => number
@@ -1081,8 +1081,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     fnArrowMethodHasReturn = (cb = function(){ }): string => "S";
 >fnArrowMethodHasReturn : (cb?: () => void) => string
@@ -1093,8 +1093,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     protected fnExpressionProtectedMethodHasReturn = function foo(cb = function(){ }): number { return 0; }
 >fnExpressionProtectedMethodHasReturn : (cb?: () => void) => number
@@ -1107,8 +1107,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected fnArrowProtectedMethodHasReturn = (cb = function(){ }): string => "S";
 >fnArrowProtectedMethodHasReturn : (cb?: () => void) => string
@@ -1119,8 +1119,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     static fnStaticExpressionMethodHasReturn = function foo(cb = function(){ }): number { return 0; }
 >fnStaticExpressionMethodHasReturn : (cb?: () => void) => number
@@ -1133,8 +1133,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static fnStaticArrowMethodHasReturn = (cb = function(){ }): string => "S";
 >fnStaticArrowMethodHasReturn : (cb?: () => void) => string
@@ -1145,8 +1145,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     protected static fnStaticExpressionProtectedMethodHasReturn = function foo(cb = function(){ }): number { return 0; }    
 >fnStaticExpressionProtectedMethodHasReturn : (cb?: () => void) => number
@@ -1159,8 +1159,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected static fnStaticArrowProtectedMethodHasReturn = (cb = function(){ }): string => "S";
 >fnStaticArrowProtectedMethodHasReturn : (cb?: () => void) => string
@@ -1171,8 +1171,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^^^^^
 >function(){ } : () => void
 >              : ^^^^^^^^^^
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     // Have annotation only on parameter
     fnExpressionOnlyOnParam = function foo(cb = function(): void { }) { return 0; }
@@ -1291,8 +1291,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void { } : () => void
 >                     : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     fnArrowOK = (cb = function(): void { }): string => "S";
 >fnArrowOK : (cb?: () => void) => string
@@ -1303,8 +1303,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void { } : () => void
 >                     : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     protected fnExpressionProtectedOk = function foo(cb = function(): void { }): number { return 0; }
 >fnExpressionProtectedOk : (cb?: () => void) => number
@@ -1317,8 +1317,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void { } : () => void
 >                     : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected fnArrowProtectedOK = (cb = function(): void { }): string => "S";
 >fnArrowProtectedOK : (cb?: () => void) => string
@@ -1329,8 +1329,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void { } : () => void
 >                     : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     static fnStaticExpressionOk = function foo(cb = function(): void{ }): number { return 0; }
 >fnStaticExpressionOk : (cb?: () => void) => number
@@ -1343,8 +1343,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static fnStaticArrowOk = (cb = function(): void{ }): string => "S";
 >fnStaticArrowOk : (cb?: () => void) => string
@@ -1355,8 +1355,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
 
     protected static fnStaticExpressionProtectedOk = function foo(cb = function(): void{ }): number { return 0; }    
 >fnStaticExpressionProtectedOk : (cb?: () => void) => number
@@ -1369,8 +1369,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     protected static fnStaticArrowProtectedOk = (cb = function(): void{ }): string => "S";
 >fnStaticArrowProtectedOk : (cb?: () => void) => string
@@ -1381,8 +1381,8 @@ export class FnParamsExportedClass {
 >   : ^^^^^^    
 >function(): void{ } : () => void
 >                    : ^^^^^^    
->"S" : string
->    : ^^^^^^
+>"S" : "S"
+>    : ^^^
     
 
     // No Error, not in declarations
diff --git a/tests/baselines/reference/isolatedDeclarationLazySymbols.types b/tests/baselines/reference/isolatedDeclarationLazySymbols.types
index cf461fa0b3b..c7e91f9680a 100644
--- a/tests/baselines/reference/isolatedDeclarationLazySymbols.types
+++ b/tests/baselines/reference/isolatedDeclarationLazySymbols.types
@@ -56,8 +56,8 @@ foo[o["prop.inner"]] ="A";
 foo[o.prop.inner] = "B";
 >foo[o.prop.inner] = "B" : "B"
 >                        : ^^^
->foo[o.prop.inner] : any
->                  : ^^^
+>foo[o.prop.inner] : string
+>                  : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >o.prop.inner : "b"
diff --git a/tests/baselines/reference/isolatedDeclarationOutFile.types b/tests/baselines/reference/isolatedDeclarationOutFile.types
index b38c28f06b6..e614a00a4b6 100644
--- a/tests/baselines/reference/isolatedDeclarationOutFile.types
+++ b/tests/baselines/reference/isolatedDeclarationOutFile.types
@@ -49,8 +49,8 @@ export class B extends A {
 >  : ^^^^^^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/isolatedDeclarationsAddUndefined.types b/tests/baselines/reference/isolatedDeclarationsAddUndefined.types
index 4f882fd4613..8c2ef0242be 100644
--- a/tests/baselines/reference/isolatedDeclarationsAddUndefined.types
+++ b/tests/baselines/reference/isolatedDeclarationsAddUndefined.types
@@ -72,8 +72,8 @@ export function foo2(p = (ip = 10 as T, v: number): void => {}): void{}
 >   : ^^^^^^
 >10 as T : number
 >        : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >v : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/isolatedModulesNoEmitOnError.types b/tests/baselines/reference/isolatedModulesNoEmitOnError.types
index 01191809d51..0f161fe7c7e 100644
--- a/tests/baselines/reference/isolatedModulesNoEmitOnError.types
+++ b/tests/baselines/reference/isolatedModulesNoEmitOnError.types
@@ -4,6 +4,6 @@
 export const x: string = 3;
 >x : string
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.types b/tests/baselines/reference/isolatedModulesPlainFile-AMD.types
index 4905f28819f..769d5c830ef 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.types
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.types
@@ -12,6 +12,6 @@ run(1);
 >       : ^^^^
 >run : (a: number) => void
 >    : ^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.types b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.types
index 0664da21554..d71cbd7da1b 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.types
+++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.types
@@ -12,6 +12,6 @@ run(1);
 >       : ^^^^
 >run : (a: number) => void
 >    : ^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-ES6.types b/tests/baselines/reference/isolatedModulesPlainFile-ES6.types
index 0ef918afe35..23ea2fd0226 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-ES6.types
+++ b/tests/baselines/reference/isolatedModulesPlainFile-ES6.types
@@ -12,6 +12,6 @@ run(1);
 >       : ^^^^
 >run : (a: number) => void
 >    : ^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-System.types b/tests/baselines/reference/isolatedModulesPlainFile-System.types
index dc0788498f6..71d1484f600 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-System.types
+++ b/tests/baselines/reference/isolatedModulesPlainFile-System.types
@@ -12,6 +12,6 @@ run(1);
 >       : ^^^^
 >run : (a: number) => void
 >    : ^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.types b/tests/baselines/reference/isolatedModulesPlainFile-UMD.types
index c92b67d950c..71cef5fff46 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.types
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.types
@@ -12,6 +12,6 @@ run(1);
 >       : ^^^^
 >run : (a: number) => void
 >    : ^ ^^      ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index bf66f95e946..1a75f09c084 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -247,8 +247,8 @@ function f2() {
 >        : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         b: box("hello"),
 >b : Box<string>
@@ -257,8 +257,8 @@ function f2() {
 >             : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         c: box(true)
 >c : Box<boolean>
@@ -309,8 +309,8 @@ function f3() {
 >        : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         b: box("hello"),
 >b : Box<string>
@@ -319,8 +319,8 @@ function f3() {
 >             : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         c: box(true)
 >c : Box<boolean>
@@ -365,8 +365,8 @@ function f4() {
 >        : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         b: box("hello"),
 >b : Box<string>
@@ -375,8 +375,8 @@ function f4() {
 >             : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         c: box(true)
 >c : Box<boolean>
@@ -456,8 +456,8 @@ function f5(s: string) {
 >        : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         b: box("hello"),
 >b : Box<string>
@@ -466,8 +466,8 @@ function f5(s: string) {
 >             : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         c: box(true)
 >c : Box<boolean>
@@ -537,8 +537,8 @@ function f6(s: string) {
 >        : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         b: box("hello"),
 >b : Box<string>
@@ -547,8 +547,8 @@ function f6(s: string) {
 >             : ^^^^^^^^^^^
 >box : <T>(x: T) => Box<T>
 >    : ^ ^^ ^^ ^^^^^      
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         c: box(true)
 >c : Box<boolean>
@@ -695,8 +695,8 @@ var g1 = applySpec({
 >(a: any) => 3 : (a: any) => number
 >              : ^ ^^   ^^^^^^^^^^^
 >a : any
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     nested: {
 >nested : { mul: (b: any) => string; }
@@ -710,8 +710,8 @@ var g1 = applySpec({
 >(b: any) => "n" : (b: any) => string
 >                : ^ ^^   ^^^^^^^^^^^
 >b : any
->"n" : string
->    : ^^^^^^
+>"n" : "n"
+>    : ^^^
     }
 });
 
@@ -780,8 +780,8 @@ foo(o, {b: 9});
 >       : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
 o = foo(o, {b: 9});
 >o = foo(o, {b: 9}) : { a: number; b: number; }
@@ -798,8 +798,8 @@ o = foo(o, {b: 9});
 >       : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
 // Inferring to { [P in K]: X }, where K extends keyof T, produces same inferences as
 // inferring to { [P in keyof T]: X }.
@@ -845,12 +845,12 @@ let x0 = f20({ foo: 42, bar: "hello" });
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >bar : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let x1 = f21({ foo: 42, bar: "hello" });
 >x1 : "foo" | "bar"
@@ -863,12 +863,12 @@ let x1 = f21({ foo: 42, bar: "hello" });
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >bar : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let x2 = f22({ foo: { value: 42} , bar: { value: "hello" } });
 >x2 : { foo: number; bar: string; }
@@ -885,16 +885,16 @@ let x2 = f22({ foo: { value: 42} , bar: { value: "hello" } });
 >             : ^^^^^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >bar : { value: string; }
 >    : ^^^^^^^^^^^^^^^^^^
 >{ value: "hello" } : { value: string; }
 >                   : ^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let x3 = f23({ foo: 42, bar: "hello" });
 >x3 : { foo: number; bar: string; }
@@ -907,12 +907,12 @@ let x3 = f23({ foo: 42, bar: "hello" });
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >bar : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let x4 = f24({ foo: 42, bar: "hello" });
 >x4 : { foo: number; bar: string; } & { foo: number; bar: string; }
@@ -925,12 +925,12 @@ let x4 = f24({ foo: 42, bar: "hello" });
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >bar : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 // Repro from #29765
 
diff --git a/tests/baselines/reference/iterableArrayPattern23.types b/tests/baselines/reference/iterableArrayPattern23.types
index 34a23e39ed0..823d9f08164 100644
--- a/tests/baselines/reference/iterableArrayPattern23.types
+++ b/tests/baselines/reference/iterableArrayPattern23.types
@@ -20,8 +20,8 @@ var a: string, b: boolean;
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >1 : true
 >  : ^^^^
 >true : true
diff --git a/tests/baselines/reference/iterableArrayPattern24.types b/tests/baselines/reference/iterableArrayPattern24.types
index 9dc1a64f55d..f33e87a009f 100644
--- a/tests/baselines/reference/iterableArrayPattern24.types
+++ b/tests/baselines/reference/iterableArrayPattern24.types
@@ -22,8 +22,8 @@ var a: string, b: boolean[];
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >1 : true
 >  : ^^^^
 >true : true
diff --git a/tests/baselines/reference/iterableArrayPattern25.types b/tests/baselines/reference/iterableArrayPattern25.types
index b4c3b92e2f8..c15612a84f6 100644
--- a/tests/baselines/reference/iterableArrayPattern25.types
+++ b/tests/baselines/reference/iterableArrayPattern25.types
@@ -26,14 +26,14 @@ takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
 >                        : ^^^^^^^^^^^^^^^^^^
 >["", 0] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 >["hello", 1] : [string, number]
 >             : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/iterableArrayPattern26.types b/tests/baselines/reference/iterableArrayPattern26.types
index 29252a62a4e..23695099bf2 100644
--- a/tests/baselines/reference/iterableArrayPattern26.types
+++ b/tests/baselines/reference/iterableArrayPattern26.types
@@ -26,14 +26,14 @@ takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
 >                        : ^^^^^^^^^^^^^^^^^^
 >["", 0] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 >["hello", 1] : [string, number]
 >             : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/iterableArrayPattern27.types b/tests/baselines/reference/iterableArrayPattern27.types
index 3a16fe3b7d2..147a49467aa 100644
--- a/tests/baselines/reference/iterableArrayPattern27.types
+++ b/tests/baselines/reference/iterableArrayPattern27.types
@@ -28,14 +28,14 @@ takeFirstTwoEntries(...new Map([["", 0], ["hello", 1]]));
 >                        : ^^^^^^^^^^^^^^^^^^
 >["", 0] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 >["hello", 1] : [string, number]
 >             : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/iterableArrayPattern28.types b/tests/baselines/reference/iterableArrayPattern28.types
index 204f42f1d2e..bbb9b912f99 100644
--- a/tests/baselines/reference/iterableArrayPattern28.types
+++ b/tests/baselines/reference/iterableArrayPattern28.types
@@ -28,14 +28,14 @@ takeFirstTwoEntries(...new Map([["", 0], ["hello", true]]));
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >["", 0] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 >["hello", true] : [string, boolean]
 >                : ^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/iterableArrayPattern29.types b/tests/baselines/reference/iterableArrayPattern29.types
index d29ac84c5b2..df9d42c944f 100644
--- a/tests/baselines/reference/iterableArrayPattern29.types
+++ b/tests/baselines/reference/iterableArrayPattern29.types
@@ -28,14 +28,14 @@ takeFirstTwoEntries(...new Map([["", true], ["hello", true]]));
 >                              : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 >["hello", true] : [string, true]
 >                : ^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/iterableArrayPattern30.types b/tests/baselines/reference/iterableArrayPattern30.types
index 072ec2f48c9..e6313f87c46 100644
--- a/tests/baselines/reference/iterableArrayPattern30.types
+++ b/tests/baselines/reference/iterableArrayPattern30.types
@@ -18,14 +18,14 @@ const [[k1, v1], [k2, v2]] = new Map([["", true], ["hello", true]])
 >                              : ^^^^^^^^^^^^^^^^
 >["", true] : [string, true]
 >           : ^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >true : true
 >     : ^^^^
 >["hello", true] : [string, true]
 >                : ^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/iteratorSpreadInArray5.types b/tests/baselines/reference/iteratorSpreadInArray5.types
index e7d8833f31c..4a450509d81 100644
--- a/tests/baselines/reference/iteratorSpreadInArray5.types
+++ b/tests/baselines/reference/iteratorSpreadInArray5.types
@@ -51,10 +51,10 @@ var array: number[] = [0, 1, ...new SymbolIterator];
 >      : ^^^^^^^^
 >[0, 1, ...new SymbolIterator] : (number | symbol)[]
 >                              : ^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 >...new SymbolIterator : symbol
 >                      : ^^^^^^
 >new SymbolIterator : SymbolIterator
diff --git a/tests/baselines/reference/iteratorSpreadInArray6.types b/tests/baselines/reference/iteratorSpreadInArray6.types
index e12d133cf9b..6762d8bf9b9 100644
--- a/tests/baselines/reference/iteratorSpreadInArray6.types
+++ b/tests/baselines/reference/iteratorSpreadInArray6.types
@@ -51,10 +51,10 @@ var array: number[] = [0, 1];
 >      : ^^^^^^^^
 >[0, 1] : number[]
 >       : ^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
 array.concat([...new SymbolIterator]);
 >array.concat([...new SymbolIterator]) : number[]
diff --git a/tests/baselines/reference/jsDeclarationsClassImplementsGenericsSerialization.types b/tests/baselines/reference/jsDeclarationsClassImplementsGenericsSerialization.types
index 3c0c780c594..a40aa8adfcc 100644
--- a/tests/baselines/reference/jsDeclarationsClassImplementsGenericsSerialization.types
+++ b/tests/baselines/reference/jsDeclarationsClassImplementsGenericsSerialization.types
@@ -31,8 +31,8 @@ export class Encoder {
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/jsDeclarationsClassStatic2.types b/tests/baselines/reference/jsDeclarationsClassStatic2.types
index bb858709ece..6b96dcc9bf0 100644
--- a/tests/baselines/reference/jsDeclarationsClassStatic2.types
+++ b/tests/baselines/reference/jsDeclarationsClassStatic2.types
@@ -41,14 +41,14 @@ class Bar extends Foo {}
 >    : ^^^
 
 Bar.foo = "foo";
->Bar.foo = "foo" : string
->                : ^^^^^^
+>Bar.foo = "foo" : "foo"
+>                : ^^^^^
 >Bar.foo : string
 >        : ^^^^^^
 >Bar : typeof Bar
 >    : ^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/jsDeclarationsClasses.types b/tests/baselines/reference/jsDeclarationsClasses.types
index 472eccb8db4..02d06cb9a36 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.types
+++ b/tests/baselines/reference/jsDeclarationsClasses.types
@@ -144,8 +144,8 @@ export class E {
     static get s1() { return ""; }
 >s1 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     /**
      * @param {string} _p
@@ -162,8 +162,8 @@ export class E {
     static get s2() { return ""; }
 >s2 : string
 >   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     /**
      * @param {string} _p
diff --git a/tests/baselines/reference/jsDeclarationsEnumTag.types b/tests/baselines/reference/jsDeclarationsEnumTag.types
index 78500a84413..0a15e726709 100644
--- a/tests/baselines/reference/jsDeclarationsEnumTag.types
+++ b/tests/baselines/reference/jsDeclarationsEnumTag.types
@@ -30,8 +30,8 @@ export const Target = {
     OK_I_GUESS: 2
 >OK_I_GUESS : number
 >           : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 /** @enum number */
 export const Second = {
@@ -50,8 +50,8 @@ export const Second = {
     FINE: 2,
 >FINE : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 /** @enum {function(number): number} */
 export const Fs = {
@@ -140,12 +140,12 @@ export function consume(t,s,f) {
 >      : ^^^^^^
 
     v = 'something else' // allowed, like Typescript's classic enums and unlike its string enums
->v = 'something else' : string
->                     : ^^^^^^
+>v = 'something else' : "something else"
+>                     : ^^^^^^^^^^^^^^^^
 >v : string
 >  : ^^^^^^
->'something else' : string
->                 : ^^^^^^
+>'something else' : "something else"
+>                 : ^^^^^^^^^^^^^^^^
 }
 /** @param {string} s */
 export function ff(s) {
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types
index dd48a49b855..d68c87dca21 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types
@@ -69,8 +69,8 @@ module.exports.Sub = class {
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >exports : typeof import("index")
 >        : ^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
index 8519911c0e7..835fccd0450 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
@@ -67,8 +67,8 @@ module.exports.Sub = function() {
 >       : ^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
 >        : ^^^ ^^      ^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 }
 module.exports.Sub.prototype = { }
 >module.exports.Sub.prototype = { } : {}
diff --git a/tests/baselines/reference/jsDeclarationsFunctionLikeClasses2.types b/tests/baselines/reference/jsDeclarationsFunctionLikeClasses2.types
index bad15185300..ea120c2271d 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionLikeClasses2.types
+++ b/tests/baselines/reference/jsDeclarationsFunctionLikeClasses2.types
@@ -80,8 +80,8 @@ Vec.prototype = {
 >                                                                     : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->`Dot product only applicable for vectors of equal length` : string
->                                                          : ^^^^^^
+>`Dot product only applicable for vectors of equal length` : "Dot product only applicable for vectors of equal length"
+>                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
         let sum = 0;
 >sum : number
@@ -399,10 +399,10 @@ export const origin = new Point2D(0, 0);
 >                  : ^^^^^^^
 >Point2D : typeof Point2D
 >        : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 // export const res = Point2D(2, 3).dot(origin); // TODO: when __proto__ works, validate this
 
diff --git a/tests/baselines/reference/jsDeclarationsImportTypeBundled.types b/tests/baselines/reference/jsDeclarationsImportTypeBundled.types
index 250c017e2fd..996ab29fef5 100644
--- a/tests/baselines/reference/jsDeclarationsImportTypeBundled.types
+++ b/tests/baselines/reference/jsDeclarationsImportTypeBundled.types
@@ -14,8 +14,8 @@ const x = {x: 12};
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 module.exports = x;
 >module.exports = x : { x: number; }
@@ -40,8 +40,8 @@ const items = [{x: 12}];
 >        : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 module.exports = items;
 >module.exports = items : import("folder/mod1").Item[]
diff --git a/tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.types b/tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.types
index 71e0a730705..696688eb1ec 100644
--- a/tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.types
+++ b/tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.types
@@ -5,14 +5,14 @@
 /** @type {String} */const a = "";
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 /** @type {Number} */const b = 0;
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {Boolean} */const c = true;
 >c : boolean
@@ -73,8 +73,8 @@
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {Object<string, string>} */const k = {x: "x"};
 >k : { [x: string]: string; }
@@ -83,8 +83,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 
 // these are not recognized as anything and should just be lookup failures
diff --git a/tests/baselines/reference/jsDeclarationsOptionalTypeLiteralProps2.types b/tests/baselines/reference/jsDeclarationsOptionalTypeLiteralProps2.types
index 75c566b64bb..7540d612df3 100644
--- a/tests/baselines/reference/jsDeclarationsOptionalTypeLiteralProps2.types
+++ b/tests/baselines/reference/jsDeclarationsOptionalTypeLiteralProps2.types
@@ -34,15 +34,15 @@ function foo({ a, b, c }) {
 >       : ^^^^^^
 >b : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >(c ?? 0) : number
 >         : ^^^^^^
 >c ?? 0 : number
 >       : ^^^^^^
 >c : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/jsDeclarationsReactComponents.types b/tests/baselines/reference/jsDeclarationsReactComponents.types
index cae38cd4f7b..ead47f32a61 100644
--- a/tests/baselines/reference/jsDeclarationsReactComponents.types
+++ b/tests/baselines/reference/jsDeclarationsReactComponents.types
@@ -195,8 +195,8 @@ TabbedShowLayout.defaultProps = {
     tabs: "default value"
 >tabs : string
 >     : ^^^^^^
->"default value" : string
->                : ^^^^^^
+>"default value" : "default value"
+>                : ^^^^^^^^^^^^^^^
 
 };
 
diff --git a/tests/baselines/reference/jsDeclarationsSubclassWithExplicitNoArgumentConstructor.types b/tests/baselines/reference/jsDeclarationsSubclassWithExplicitNoArgumentConstructor.types
index 29e717844c1..30fd98aa3d1 100644
--- a/tests/baselines/reference/jsDeclarationsSubclassWithExplicitNoArgumentConstructor.types
+++ b/tests/baselines/reference/jsDeclarationsSubclassWithExplicitNoArgumentConstructor.types
@@ -28,9 +28,9 @@ export class Sub extends Super {
 >                         : ^^^^
 >super : typeof Super
 >      : ^^^^^^^^^^^^
->'first' : string
->        : ^^^^^^
->'second' : string
->         : ^^^^^^
+>'first' : "first"
+>        : ^^^^^^^
+>'second' : "second"
+>         : ^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types
index b25bb5dadbe..22e5ccfef6b 100644
--- a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types
+++ b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types
@@ -66,16 +66,16 @@ class Wrap {
 
         /** @type {import("./conn").Whatever} */
         this.another = "";
->this.another = "" : string
->                  : ^^^^^^
+>this.another = "" : ""
+>                  : ^^
 >this.another : import("conn").Whatever
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >another : import("conn").Whatever
 >        : ^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
index 412a019570a..d96bf0f5fc4 100644
--- a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
+++ b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
@@ -83,8 +83,8 @@ const taskGroups = {
         label: 'Parse HTML & CSS'
 >label : string
 >      : ^^^^^^
->'Parse HTML & CSS' : string
->                   : ^^^^^^
+>'Parse HTML & CSS' : "Parse HTML & CSS"
+>                   : ^^^^^^^^^^^^^^^^^^
 
     },
     styleLayout: {
@@ -102,8 +102,8 @@ const taskGroups = {
         label: 'Style & Layout'
 >label : string
 >      : ^^^^^^
->'Style & Layout' : string
->                 : ^^^^^^
+>'Style & Layout' : "Style & Layout"
+>                 : ^^^^^^^^^^^^^^^^
 
     },
 }
diff --git a/tests/baselines/reference/jsDeclarationsUniqueSymbolUsage.types b/tests/baselines/reference/jsDeclarationsUniqueSymbolUsage.types
index cc695a9ab82..23fd77525e7 100644
--- a/tests/baselines/reference/jsDeclarationsUniqueSymbolUsage.types
+++ b/tests/baselines/reference/jsDeclarationsUniqueSymbolUsage.types
@@ -8,8 +8,8 @@ export const kSymbol = Symbol("my-symbol");
 >                    : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"my-symbol" : string
->            : ^^^^^^
+>"my-symbol" : "my-symbol"
+>            : ^^^^^^^^^^^
 
 /**
  * @typedef {{[kSymbol]: true}} WithSymbol
diff --git a/tests/baselines/reference/jsEnumCrossFileExport.types b/tests/baselines/reference/jsEnumCrossFileExport.types
index 41dbe38a396..2978038903c 100644
--- a/tests/baselines/reference/jsEnumCrossFileExport.types
+++ b/tests/baselines/reference/jsEnumCrossFileExport.types
@@ -153,8 +153,8 @@ Other.Cls = class {
 var x = "ok";
 >x : string
 >  : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 
 /**
  * @type {Host.UserMetrics.Blah}
@@ -162,6 +162,6 @@ var x = "ok";
 var y = "ok";
 >y : string
 >  : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/jsExportAssignmentNonMutableLocation.types b/tests/baselines/reference/jsExportAssignmentNonMutableLocation.types
index bd92c8aee09..8b4ccbdf94f 100644
--- a/tests/baselines/reference/jsExportAssignmentNonMutableLocation.types
+++ b/tests/baselines/reference/jsExportAssignmentNonMutableLocation.types
@@ -8,8 +8,8 @@ const customSymbol = Symbol("custom");
 >                 : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"custom" : string
->         : ^^^^^^
+>"custom" : "custom"
+>         : ^^^^^^^^
 
 // This is a common pattern in Node’s built-in modules:
 module.exports = {
@@ -43,6 +43,6 @@ exports.customSymbol2 = Symbol("custom");
 >                 : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"custom" : string
->         : ^^^^^^
+>"custom" : "custom"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types
index b4354188c5f..6ac3f644544 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types
@@ -62,6 +62,6 @@ const x: Abcde = { b: "" };
 >          : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/jsFileClassPropertyType.types b/tests/baselines/reference/jsFileClassPropertyType.types
index a9a0a8f2da6..714fc5dc66b 100644
--- a/tests/baselines/reference/jsFileClassPropertyType.types
+++ b/tests/baselines/reference/jsFileClassPropertyType.types
@@ -22,8 +22,8 @@ class C {
 
 === bar.ts ===
 (new C()).p = "string";
->(new C()).p = "string" : string
->                       : ^^^^^^
+>(new C()).p = "string" : "string"
+>                       : ^^^^^^^^
 >(new C()).p : number
 >            : ^^^^^^
 >(new C()) : C
@@ -34,6 +34,6 @@ class C {
 >  : ^^^^^^^^
 >p : number
 >  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/jsFileClassPropertyType2.types b/tests/baselines/reference/jsFileClassPropertyType2.types
index 5740d05a9fe..e0d40653681 100644
--- a/tests/baselines/reference/jsFileClassPropertyType2.types
+++ b/tests/baselines/reference/jsFileClassPropertyType2.types
@@ -39,6 +39,6 @@ class C {
 >  : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/jsFileClassPropertyType3.types b/tests/baselines/reference/jsFileClassPropertyType3.types
index 1d1b4292881..5ab2d71d0c5 100644
--- a/tests/baselines/reference/jsFileClassPropertyType3.types
+++ b/tests/baselines/reference/jsFileClassPropertyType3.types
@@ -38,8 +38,8 @@ class C {
 
 === bar.ts ===
 (new C()).p = "string"; // Error
->(new C()).p = "string" : string
->                       : ^^^^^^
+>(new C()).p = "string" : "string"
+>                       : ^^^^^^^^
 >(new C()).p : number
 >            : ^^^^^^
 >(new C()) : C
@@ -50,6 +50,6 @@ class C {
 >  : ^^^^^^^^
 >p : number
 >  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/jsFileCompilationAwaitModifier.types b/tests/baselines/reference/jsFileCompilationAwaitModifier.types
index ffb8334f247..f8e51c939f0 100644
--- a/tests/baselines/reference/jsFileCompilationAwaitModifier.types
+++ b/tests/baselines/reference/jsFileCompilationAwaitModifier.types
@@ -20,8 +20,8 @@ class Foo {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 
     b = async () => {
@@ -41,8 +41,8 @@ class Foo {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types
index 1ff4331a9e4..031d0b61f8e 100644
--- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types
+++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types
@@ -8,12 +8,12 @@ let a = 10;
 >   : ^^
 
 b = 30;
->b = 30 : number
->       : ^^^^^^
+>b = 30 : 30
+>       : ^^
 >b : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
 === a.ts ===
 let b = 30;
@@ -23,10 +23,10 @@ let b = 30;
 >   : ^^
 
 a = 10;
->a = 10 : number
->       : ^^^^^^
+>a = 10 : 10
+>       : ^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.types b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.types
index 76c01f70907..bdabc16745a 100644
--- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.types
+++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.types
@@ -8,12 +8,12 @@ let b = 30;
 >   : ^^
 
 a = 10;
->a = 10 : number
->       : ^^^^^^
+>a = 10 : 10
+>       : ^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 === b.js ===
 let a = 10;
@@ -23,10 +23,10 @@ let a = 10;
 >   : ^^
 
 b = 30;
->b = 30 : number
->       : ^^^^^^
+>b = 30 : 30
+>       : ^^
 >b : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.types b/tests/baselines/reference/jsFileCompilationTypeAssertions.types
index 296e104e87d..710526c6785 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAssertions.types
+++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.types
@@ -4,8 +4,8 @@
 0 as number;
 >0 as number : number
 >            : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var v = <string>undefined;
 >v : any
diff --git a/tests/baselines/reference/jsFileMethodOverloads3.types b/tests/baselines/reference/jsFileMethodOverloads3.types
index 754b44a0a78..21075dda291 100644
--- a/tests/baselines/reference/jsFileMethodOverloads3.types
+++ b/tests/baselines/reference/jsFileMethodOverloads3.types
@@ -33,8 +33,8 @@ export let a = id(123);
 >        : ^^^
 >id : { (x: number): any; (x: string): any; }
 >   : ^^^ ^^      ^^^^^^^^^ ^^      ^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 export let b = id("hello");
 >b : any
@@ -43,6 +43,6 @@ export let b = id("hello");
 >            : ^^^
 >id : { (x: number): any; (x: string): any; }
 >   : ^^^ ^^      ^^^^^^^^^ ^^      ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
index c78078d6c97..f8ff1ce2977 100644
--- a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
+++ b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
@@ -107,16 +107,16 @@ function getObj() {
 
 === b.ts ===
 variable.a = 1;
->variable.a = 1 : number
->               : ^^^^^^
+>variable.a = 1 : 1
+>               : ^
 >variable.a : number
 >           : ^^^^^^
 >variable : typeof variable
 >         : ^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 (new C()).member.a = 1;
 >(new C()).member.a = 1 : 1
diff --git a/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types b/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types
index cbdff1c0448..43c2402418d 100644
--- a/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types
+++ b/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types
@@ -16,8 +16,8 @@ var numberArray = [5];
 >            : ^^^^^^^^
 >[5] : number[]
 >    : ^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 /**
  * @param {Array} arr
@@ -46,8 +46,8 @@ var anyPromise = Promise.resolve(5);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 /** @type {Promise<number>} */
 var numberPromise = Promise.resolve(5);
@@ -61,8 +61,8 @@ var numberPromise = Promise.resolve(5);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 /**
  * @param {Promise} pr
diff --git a/tests/baselines/reference/jsdocArrayObjectPromiseNoImplicitAny.types b/tests/baselines/reference/jsdocArrayObjectPromiseNoImplicitAny.types
index 8ec1fa84ce6..8e70490b022 100644
--- a/tests/baselines/reference/jsdocArrayObjectPromiseNoImplicitAny.types
+++ b/tests/baselines/reference/jsdocArrayObjectPromiseNoImplicitAny.types
@@ -16,8 +16,8 @@ var numberArray = [5];
 >            : ^^^^^^^^
 >[5] : number[]
 >    : ^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 /**
  * @param {Array} arr
@@ -46,8 +46,8 @@ var notAnyPromise = Promise.resolve(5);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 /** @type {Promise<number>} */
 var numberPromise = Promise.resolve(5);
@@ -61,8 +61,8 @@ var numberPromise = Promise.resolve(5);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 /**
  * @param {Promise} pr
diff --git a/tests/baselines/reference/jsdocBracelessTypeTag1.types b/tests/baselines/reference/jsdocBracelessTypeTag1.types
index 53f9147e989..3f6737aefae 100644
--- a/tests/baselines/reference/jsdocBracelessTypeTag1.types
+++ b/tests/baselines/reference/jsdocBracelessTypeTag1.types
@@ -7,8 +7,8 @@ function fn1() {
 >    : ^^^^^^      
 
   return 42;
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 /** @type () => string */
@@ -17,8 +17,8 @@ function fn2() {
 >    : ^^^^^^      
 
   return "foo";
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 }
 
 /** @type (arg: string) => string */
@@ -45,8 +45,8 @@ const obj1 = { type: "foo", prop: 10 };
 >      : ^^^^^
 >prop : number
 >     : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 /** @type ({ type: 'foo' } | { type: 'bar' }) & { prop: number } */
 const obj2 = { type: "other", prop: 10 };
@@ -60,6 +60,6 @@ const obj2 = { type: "other", prop: 10 };
 >        : ^^^^^^^
 >prop : number
 >     : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/jsdocDisallowedInTypescript.types b/tests/baselines/reference/jsdocDisallowedInTypescript.types
index 257725811c0..ed65778bddf 100644
--- a/tests/baselines/reference/jsdocDisallowedInTypescript.types
+++ b/tests/baselines/reference/jsdocDisallowedInTypescript.types
@@ -7,12 +7,12 @@ var ara: Array.<number> = [1,2,3];
 >    : ^^^^^^^^
 >[1,2,3] : number[]
 >        : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 function f(x: ?number, y: Array.<number>) {
 >f : (x: number | null, y: Array<number>) => number
@@ -57,8 +57,8 @@ function hof(ctor: function(new: number, string)) {
 >               : ^^^^^^
 >ctor : new (arg1: string) => number
 >     : ^^^^^^^^^^^      ^^^^^^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 }
 function hof2(f: function(this: number, string): string) {
 >hof2 : (f: (this: number, arg1: string) => string) => string
@@ -73,8 +73,8 @@ function hof2(f: function(this: number, string): string) {
 >               : ^^^^^^
 >f : (this: number, arg1: string) => string
 >  : ^    ^^      ^^^^^^^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >'hullo' : "hullo"
 >        : ^^^^^^^
 }
@@ -109,14 +109,14 @@ var g: function(number, number): number = (n,m) => n + m;
 var most: !string = 'definite';
 >most : string
 >     : ^^^^^^
->'definite' : string
->           : ^^^^^^
+>'definite' : "definite"
+>           : ^^^^^^^^^^
 
 var postfixdef: number! = 101;
 >postfixdef : number
 >           : ^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
 
 var postfixopt: number? = undefined;
 >postfixopt : number | null
diff --git a/tests/baselines/reference/jsdocFunctionType.types b/tests/baselines/reference/jsdocFunctionType.types
index 5c740b294a1..1530322c4ef 100644
--- a/tests/baselines/reference/jsdocFunctionType.types
+++ b/tests/baselines/reference/jsdocFunctionType.types
@@ -93,8 +93,8 @@ var z = new y(12);
 >          : ^^^^^^^^^^      ^^^
 >y : new (arg1: number) => { length: number; }
 >  : ^^^^^^^^^^^      ^^^^^^^^^^^^^^^      ^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 z.length;
 >z.length : number
@@ -168,8 +168,8 @@ var z2 = new y2(33);
 >           : ^^^^^^^^^^      ^^^
 >y2 : new (arg1: number) => { length: number; }
 >   : ^^^^^^^^^^^      ^^^^^^^^^^^^^^^      ^^^
->33 : number
->   : ^^^^^^
+>33 : 33
+>   : ^^
 
 z2.length;
 >z2.length : number
@@ -195,8 +195,8 @@ var construct = function(dref) { return new dref(33); }
 >             : ^
 >dref : new (arg1: number) => D
 >     : ^^^^^^^^^^^      ^^^^^^
->33 : number
->   : ^^^^^^
+>33 : 33
+>   : ^^
 
 var z3 = construct(D);
 >z3 : D
@@ -275,20 +275,20 @@ foo('abc', 'def');
 >                  : ^^^^
 >foo : (...args: [string, string] | [number, string, string]) => void
 >    : ^^^^    ^^                                           ^^^^^    
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
 foo(42, 'abc', 'def');
 >foo(42, 'abc', 'def') : void
 >                      : ^^^^
 >foo : (...args: [string, string] | [number, string, string]) => void
 >    : ^^^^    ^^                                           ^^^^^    
->42 : number
->   : ^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>42 : 42
+>   : ^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/jsdocImplements_class.types b/tests/baselines/reference/jsdocImplements_class.types
index 2c48a8bcc0f..df83fca074c 100644
--- a/tests/baselines/reference/jsdocImplements_class.types
+++ b/tests/baselines/reference/jsdocImplements_class.types
@@ -35,8 +35,8 @@ class B2  {
     method() { return "" }
 >method : () => string
 >       : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 /** @implements {A} */
diff --git a/tests/baselines/reference/jsdocImportType.types b/tests/baselines/reference/jsdocImportType.types
index 00f4db3b738..43f9c1784e9 100644
--- a/tests/baselines/reference/jsdocImportType.types
+++ b/tests/baselines/reference/jsdocImportType.types
@@ -23,8 +23,8 @@ const D = require("./mod1");
 >                  : ^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->"./mod1" : string
->         : ^^^^^^
+>"./mod1" : "./mod1"
+>         : ^^^^^^^^
 
 /** @type {D} */
 var d;
diff --git a/tests/baselines/reference/jsdocImportType2.types b/tests/baselines/reference/jsdocImportType2.types
index fefd2b86f49..e9161386fef 100644
--- a/tests/baselines/reference/jsdocImportType2.types
+++ b/tests/baselines/reference/jsdocImportType2.types
@@ -23,8 +23,8 @@ const D = require("./mod1");
 >                  : ^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->"./mod1" : string
->         : ^^^^^^
+>"./mod1" : "./mod1"
+>         : ^^^^^^^^
 
 /** @type {D} */
 var d;
diff --git a/tests/baselines/reference/jsdocParamTagTypeLiteral.types b/tests/baselines/reference/jsdocParamTagTypeLiteral.types
index 6252d2333ee..67272709b33 100644
--- a/tests/baselines/reference/jsdocParamTagTypeLiteral.types
+++ b/tests/baselines/reference/jsdocParamTagTypeLiteral.types
@@ -54,8 +54,8 @@ foo1({x: 'abc'});
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
 /**
  * @param {Object[]} opts2
@@ -92,8 +92,8 @@ foo2([{anotherX: "world"}]);
 >                    : ^^^^^^^^^^^^^^^^^^^^^
 >anotherX : string
 >         : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 /**
  * @param {object} opts3
@@ -122,8 +122,8 @@ foo3({x: 'abc'});
 >           : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
 /**
  * @param {object[]} opts4
@@ -162,8 +162,8 @@ foo4([{ x: 'hi' }]);
 >            : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
 /**
  * @param {object[]} opts5 - Let's test out some multiple nesting levels
@@ -229,7 +229,7 @@ foo5([{ help: "help", what: { a: 'a', bad: [{ idea: 'idea', oh: false }] }, unne
 >                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >help : string
 >     : ^^^^^^
->"help" : string
+>"help" : "help"
 >       : ^^^^^^
 >what : { a: string; bad: { idea: string; oh: false; }[]; }
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -237,8 +237,8 @@ foo5([{ help: "help", what: { a: 'a', bad: [{ idea: 'idea', oh: false }] }, unne
 >                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >bad : { idea: string; oh: false; }[]
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[{ idea: 'idea', oh: false }] : { idea: string; oh: false; }[]
@@ -247,7 +247,7 @@ foo5([{ help: "help", what: { a: 'a', bad: [{ idea: 'idea', oh: false }] }, unne
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >idea : string
 >     : ^^^^^^
->'idea' : string
+>'idea' : "idea"
 >       : ^^^^^^
 >oh : false
 >   : ^^^^^
@@ -255,6 +255,6 @@ foo5([{ help: "help", what: { a: 'a', bad: [{ idea: 'idea', oh: false }] }, unne
 >      : ^^^^^
 >unnest : number
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/jsdocPostfixEqualsAddsOptionality.types b/tests/baselines/reference/jsdocPostfixEqualsAddsOptionality.types
index 78167649993..91c857fd4c5 100644
--- a/tests/baselines/reference/jsdocPostfixEqualsAddsOptionality.types
+++ b/tests/baselines/reference/jsdocPostfixEqualsAddsOptionality.types
@@ -9,12 +9,12 @@ function f(a) {
 >  : ^^^^^^^^^^^^^^^^^^
 
     a = 1
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = null // should not be allowed
 >a = null : null
@@ -55,8 +55,8 @@ f(1)
 >     : ^^^^
 >f : (a?: number | undefined) => void
 >  : ^ ^^^         ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 /** @param {???!?number?=} a */
 function g(a) {
@@ -66,12 +66,12 @@ function g(a) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
     a = 1
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : number | null | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = null
 >a = null : null
@@ -112,6 +112,6 @@ g(1)
 >     : ^^^^
 >g : (a?: (((((number | null) | null) | null) | null) | null) | undefined) => void
 >  : ^ ^^^^^^^^         ^^^^^   ^^^^^   ^^^^^   ^^^^^   ^^^^^   ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/jsdocReadonly.types b/tests/baselines/reference/jsdocReadonly.types
index 643e3c45814..9a9569b042a 100644
--- a/tests/baselines/reference/jsdocReadonly.types
+++ b/tests/baselines/reference/jsdocReadonly.types
@@ -14,8 +14,8 @@ class LOL {
     x = 1
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     /** @readonly */
     y = 2
diff --git a/tests/baselines/reference/jsdocRestParameter.types b/tests/baselines/reference/jsdocRestParameter.types
index a03be1c48ae..dfa0bfa496c 100644
--- a/tests/baselines/reference/jsdocRestParameter.types
+++ b/tests/baselines/reference/jsdocRestParameter.types
@@ -38,18 +38,18 @@ f(1, "2"); // Error
 >          : ^^^^
 >f : (...args: number[]) => void
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"2" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"2" : "2"
+>    : ^^^
 
 f(1, 2);
 >f(1, 2) : void
 >        : ^^^^
 >f : (...args: number[]) => void
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/jsdocReturnTag1.types b/tests/baselines/reference/jsdocReturnTag1.types
index 85e791e1692..4f3e5bd14dc 100644
--- a/tests/baselines/reference/jsdocReturnTag1.types
+++ b/tests/baselines/reference/jsdocReturnTag1.types
@@ -9,8 +9,8 @@ function f() {
 >  : ^^^^^^      
 
     return 5;
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 }
 
 /**
@@ -21,8 +21,8 @@ function f1() {
 >   : ^^^^^^         ^^^^^^^^^
 
     return 5;
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 }
 
 /**
@@ -33,11 +33,11 @@ function f2() {
 >   : ^^^^^^               
 
     return 5 || "hello";
->5 || "hello" : string | number
->             : ^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>5 || "hello" : 5 | "hello"
+>             : ^^^^^^^^^^^
+>5 : 5
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
diff --git a/tests/baselines/reference/jsdocTemplateClass.types b/tests/baselines/reference/jsdocTemplateClass.types
index a629c05c1dc..82984631055 100644
--- a/tests/baselines/reference/jsdocTemplateClass.types
+++ b/tests/baselines/reference/jsdocTemplateClass.types
@@ -65,8 +65,8 @@ var f = new Foo(1)
 >           : ^^^^^^^^^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var g = new Foo(false)
 >g : Foo<boolean>
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction.types b/tests/baselines/reference/jsdocTemplateConstructorFunction.types
index 9ff779cd2d6..0ce345ed26b 100644
--- a/tests/baselines/reference/jsdocTemplateConstructorFunction.types
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction.types
@@ -99,8 +99,8 @@ var z = new Zet(1)
 >           : ^^^^^^^^^^^
 >Zet : typeof Zet
 >    : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 z.t = 2
 >z.t = 2 : 2
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction2.types b/tests/baselines/reference/jsdocTemplateConstructorFunction2.types
index d745ebf2d5a..aade697f498 100644
--- a/tests/baselines/reference/jsdocTemplateConstructorFunction2.types
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction2.types
@@ -92,8 +92,8 @@ var z = new Zet(1)
 >           : ^^^^^^^^^^^
 >Zet : typeof Zet
 >    : ^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 z.t = 2
 >z.t = 2 : 2
@@ -131,14 +131,14 @@ let answer = z.add(3, { nested: 4 })
 >  : ^^^^^^^^^^^
 >add : (v: number, o: { nested: number; }) => number
 >    : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ nested: 4 } : { nested: number; }
 >              : ^^^^^^^^^^^^^^^^^^^
 >nested : number
 >       : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 // lookup in typedef should not crash the compiler, even when the type is unknown
 /**
diff --git a/tests/baselines/reference/jsdocTemplateTag.types b/tests/baselines/reference/jsdocTemplateTag.types
index 0cefdcfefbf..9f3d1ac9e66 100644
--- a/tests/baselines/reference/jsdocTemplateTag.types
+++ b/tests/baselines/reference/jsdocTemplateTag.types
@@ -26,8 +26,8 @@ let n = f(1)()
 >     : ^^^^^^^^^^^^
 >f : <T>(a: T) => () => T
 >  : ^ ^^ ^^ ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 /**
  * @param {T} a
@@ -55,8 +55,8 @@ let s = g('hi')()
 >        : ^^^^^^^^^^^^
 >g : <T>(a: T) => () => T
 >  : ^ ^^ ^^ ^^^^^       
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
 /**
  * @param {Array.<Object>} keyframes - Can't look up types on Element since it's a global in another file. (But it shouldn't crash).
diff --git a/tests/baselines/reference/jsdocTemplateTag3.types b/tests/baselines/reference/jsdocTemplateTag3.types
index f7f8792e5a5..45311a690ce 100644
--- a/tests/baselines/reference/jsdocTemplateTag3.types
+++ b/tests/baselines/reference/jsdocTemplateTag3.types
@@ -93,12 +93,12 @@ f({ a: 12, b: 'hi', c: null }, undefined, { c: false, d: 12, b: undefined }, 101
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >b : string
 >  : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 >c : null
 >  : ^^^^
 >undefined : undefined
@@ -111,8 +111,8 @@ f({ a: 12, b: 'hi', c: null }, undefined, { c: false, d: 12, b: undefined }, 101
 >      : ^^^^^
 >d : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >b : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
@@ -131,8 +131,8 @@ f({ a: 12  }, undefined, undefined, 101, 'nope');
 >           : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >undefined : undefined
 >          : ^^^^^^^^^
 >undefined : undefined
diff --git a/tests/baselines/reference/jsdocTemplateTag8.types b/tests/baselines/reference/jsdocTemplateTag8.types
index a4afb162243..aab64d6471e 100644
--- a/tests/baselines/reference/jsdocTemplateTag8.types
+++ b/tests/baselines/reference/jsdocTemplateTag8.types
@@ -17,8 +17,8 @@ let super_covariant = { x: 1 };
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 /**
  * @type {Covariant<string>}
@@ -30,8 +30,8 @@ let sub_covariant = { x: '' };
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 super_covariant = sub_covariant;
 >super_covariant = sub_covariant : Covariant<string>
@@ -136,8 +136,8 @@ let sub_invariant = { f: (x) => { return "" } };
 >                     : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 super_invariant = sub_invariant;  // Error
 >super_invariant = sub_invariant : Invariant<string>
diff --git a/tests/baselines/reference/jsdocTemplateTagDefault.types b/tests/baselines/reference/jsdocTemplateTagDefault.types
index da5d54fb3ff..5c8aea32481 100644
--- a/tests/baselines/reference/jsdocTemplateTagDefault.types
+++ b/tests/baselines/reference/jsdocTemplateTagDefault.types
@@ -12,8 +12,8 @@ const aDefault1 = [""];
 >          : ^^^^^^^^^
 >[""] : [string]
 >     : ^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 /** @type {A} */ // error: `number` is not assignable to string`
 const aDefault2 = [0];
@@ -21,8 +21,8 @@ const aDefault2 = [0];
 >          : ^^^^^^^^^
 >[0] : [number]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /** @type {A<string>} */ // ok, `T` is provided for `A`
 const aString = [""];
@@ -30,8 +30,8 @@ const aString = [""];
 >        : ^^^^^^^^^
 >[""] : [string]
 >     : ^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 /** @type {A<number>} */ // ok, `T` is provided for `A`
 const aNumber = [0];
@@ -39,8 +39,8 @@ const aNumber = [0];
 >        : ^^^^^^^^^
 >[0] : [number]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 /**
  * @template T
diff --git a/tests/baselines/reference/jsdocTemplateTagNameResolution.types b/tests/baselines/reference/jsdocTemplateTagNameResolution.types
index 667590712e3..6dddfe2427e 100644
--- a/tests/baselines/reference/jsdocTemplateTagNameResolution.types
+++ b/tests/baselines/reference/jsdocTemplateTagNameResolution.types
@@ -21,6 +21,6 @@ const x = { a: 1 };
 const y = "a";
 >y : number
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/jsdocTypeFromChainedAssignment.types b/tests/baselines/reference/jsdocTypeFromChainedAssignment.types
index 944e0f19d50..a53156a9c53 100644
--- a/tests/baselines/reference/jsdocTypeFromChainedAssignment.types
+++ b/tests/baselines/reference/jsdocTypeFromChainedAssignment.types
@@ -137,8 +137,8 @@ a.y('no') // error
 >  : ^
 >y : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
 a.z('not really') // error
 >a.z('not really') : number
@@ -149,8 +149,8 @@ a.z('not really') // error
 >  : ^
 >z : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->'not really' : string
->             : ^^^^^^
+>'not really' : "not really"
+>             : ^^^^^^^^^^^^
 
 A.s('still no') // error
 >A.s('still no') : any
@@ -161,8 +161,8 @@ A.s('still no') // error
 >  : ^^^^^^^^
 >s : (m: number) => any
 >  : ^ ^^      ^^^^^^^^
->'still no' : string
->           : ^^^^^^
+>'still no' : "still no"
+>           : ^^^^^^^^^^
 
 A.t('not here either') // error
 >A.t('not here either') : any
@@ -173,8 +173,8 @@ A.t('not here either') // error
 >  : ^^^^^^^^
 >t : (m: number) => any
 >  : ^ ^^      ^^^^^^^^
->'not here either' : string
->                  : ^^^^^^
+>'not here either' : "not here either"
+>                  : ^^^^^^^^^^^^^^^^^
 
 a.first = 10 // error: '10' isn't assignable to '1'
 >a.first = 10 : 10
diff --git a/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types b/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types
index 19f3a78480c..7c8f37e08dc 100644
--- a/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types
+++ b/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types
@@ -20,8 +20,8 @@ mod.f('no')
 >    : ^^^^^^^^^^
 >f : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
 mod.g('also no')
 >mod.g('also no') : number
@@ -32,8 +32,8 @@ mod.g('also no')
 >    : ^^^^^^^^^^
 >g : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->'also no' : string
->          : ^^^^^^
+>'also no' : "also no"
+>          : ^^^^^^^^^
 
 mod.h(0)
 >mod.h(0) : string
@@ -44,8 +44,8 @@ mod.h(0)
 >    : ^^^^^^^^^^
 >h : (mom: string) => string
 >  : ^   ^^      ^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 mod.i(1)
 >mod.i(1) : string
@@ -56,8 +56,8 @@ mod.i(1)
 >    : ^^^^^^^^^^
 >i : (mom: string) => string
 >  : ^   ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 === mod.js ===
 /** @param {number} n */
diff --git a/tests/baselines/reference/jsdocTypeReferenceToValue.types b/tests/baselines/reference/jsdocTypeReferenceToValue.types
index 84790a314f6..adcdf06da1a 100644
--- a/tests/baselines/reference/jsdocTypeReferenceToValue.types
+++ b/tests/baselines/reference/jsdocTypeReferenceToValue.types
@@ -13,9 +13,9 @@ function process(image) {
 >                : ^^^^^^^^^^^^^^^^
 >image : new (width?: number, height?: number) => HTMLImageElement
 >      : ^^^^^     ^^^      ^^      ^^^      ^^^^^                
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 }
 
diff --git a/tests/baselines/reference/jsdocTypeTagCast.types b/tests/baselines/reference/jsdocTypeTagCast.types
index b4e053fa0e4..76e2c8c3a80 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.types
+++ b/tests/baselines/reference/jsdocTypeTagCast.types
@@ -22,8 +22,8 @@ var W = /** @type {string} */(4); // Error
 >  : ^^^^^^
 >(4) : string
 >    : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 /** @type {*} */
 var a;
@@ -128,16 +128,16 @@ function SomeFakeClass() {
 
     /** @type {string|number} */
     this.p = "bar";
->this.p = "bar" : string
->               : ^^^^^^
+>this.p = "bar" : "bar"
+>               : ^^^^^
 >this.p : string | number
 >       : ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >p : string | number
 >  : ^^^^^^^^^^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 }
 
 // Type assertion should check for assignability in either direction
diff --git a/tests/baselines/reference/jsdocTypeTagParameterType.types b/tests/baselines/reference/jsdocTypeTagParameterType.types
index a8ffd03a5ba..a85b3f3f7f7 100644
--- a/tests/baselines/reference/jsdocTypeTagParameterType.types
+++ b/tests/baselines/reference/jsdocTypeTagParameterType.types
@@ -11,12 +11,12 @@ const f = (value) => {
 >      : ^^^^^^
 
     value = 1 // should error
->value = 1 : number
->          : ^^^^^^
+>value = 1 : 1
+>          : ^
 >value : string
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 /** @type {(s: string) => void} */
@@ -27,11 +27,11 @@ function g(s) {
 >  : ^^^^^^
 
     s = 1 // Should error
->s = 1 : number
->      : ^^^^^^
+>s = 1 : 1
+>      : ^
 >s : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
diff --git a/tests/baselines/reference/jsdocTypedefMissingType.types b/tests/baselines/reference/jsdocTypedefMissingType.types
index 5d3cf5c78ca..5d6112010c8 100644
--- a/tests/baselines/reference/jsdocTypedefMissingType.types
+++ b/tests/baselines/reference/jsdocTypedefMissingType.types
@@ -24,6 +24,6 @@ const person = { name: "" };
 >             : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/jsdocVariadicType.types b/tests/baselines/reference/jsdocVariadicType.types
index 61df134b9fb..8b2cf14402a 100644
--- a/tests/baselines/reference/jsdocVariadicType.types
+++ b/tests/baselines/reference/jsdocVariadicType.types
@@ -24,6 +24,6 @@ foo(false, '');
 >    : ^^^^^^^       ^^^^^^^^      ^^^^^^^^^^^     ^^^^^    
 >false : false
 >      : ^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/json.stringify.types b/tests/baselines/reference/json.stringify.types
index ba29c6d8841..e4651978fed 100644
--- a/tests/baselines/reference/json.stringify.types
+++ b/tests/baselines/reference/json.stringify.types
@@ -18,8 +18,8 @@ JSON.stringify(value, undefined, 2);
 >      : ^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 JSON.stringify(value, null, 2);
 >JSON.stringify(value, null, 2) : string
@@ -32,8 +32,8 @@ JSON.stringify(value, null, 2);
 >          : ^^^     ^^   ^^        ^^^                                           ^^     ^^^               ^^^      ^^^     ^^   ^^        ^^^                          ^^     ^^^               ^^^      ^^^
 >value : null
 >      : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 JSON.stringify(value, ["a", 1], 2);
 >JSON.stringify(value, ["a", 1], 2) : string
@@ -48,12 +48,12 @@ JSON.stringify(value, ["a", 1], 2);
 >      : ^^^^
 >["a", 1] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 JSON.stringify(value, (k) => undefined, 2);
 >JSON.stringify(value, (k) => undefined, 2) : string
@@ -72,8 +72,8 @@ JSON.stringify(value, (k) => undefined, 2);
 >  : ^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 JSON.stringify(value, undefined, 2);
 >JSON.stringify(value, undefined, 2) : string
@@ -88,6 +88,6 @@ JSON.stringify(value, undefined, 2);
 >      : ^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/jsxChildrenGenericContextualTypes.types b/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
index f3f7094e4eb..4d86c765cc2 100644
--- a/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
+++ b/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
@@ -49,8 +49,8 @@ Elem({prop: {a: "x"}, children: i => ({a: "z"})});
 >         : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 >children : (i: { a: string; }) => { a: string; }
 >         : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >i => ({a: "z"}) : (i: { a: string; }) => { a: string; }
@@ -63,8 +63,8 @@ Elem({prop: {a: "x"}, children: i => ({a: "z"})});
 >         : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"z" : string
->    : ^^^^^^
+>"z" : "z"
+>    : ^^^
 
 const q = <Elem prop={{a: "x"}} children={i => ({a: "z"})} />
 >q : JSX.Element
@@ -79,8 +79,8 @@ const q = <Elem prop={{a: "x"}} children={i => ({a: "z"})} />
 >         : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 >children : (i: { a: string; }) => { a: string; }
 >         : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >i => ({a: "z"}) : (i: { a: string; }) => { a: string; }
@@ -93,8 +93,8 @@ const q = <Elem prop={{a: "x"}} children={i => ({a: "z"})} />
 >         : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"z" : string
->    : ^^^^^^
+>"z" : "z"
+>    : ^^^
 
 const qq = <Elem prop={{a: "x"}}>{i => ({a: "z"})}</Elem>
 >qq : JSX.Element
@@ -109,8 +109,8 @@ const qq = <Elem prop={{a: "x"}}>{i => ({a: "z"})}</Elem>
 >         : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 >i => ({a: "z"}) : (i: { a: string; }) => { a: string; }
 >                : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >i : { a: string; }
@@ -121,8 +121,8 @@ const qq = <Elem prop={{a: "x"}}>{i => ({a: "z"})}</Elem>
 >         : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"z" : string
->    : ^^^^^^
+>"z" : "z"
+>    : ^^^
 >Elem : <T, U = never>(p: { prop: T; children: (t: T) => T; }) => JSX.Element
 >     : ^ ^^ ^^^^^^^^^^ ^^                                   ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.types b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.types
index 18f229af6f2..4584254e689 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.types
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.types
@@ -59,8 +59,8 @@ export class App extends React.Component<{}> {
                 ['Users', <div/>],
 >['Users', <div/>] : [string, JSX.Element]
 >                  : ^^^^^^^^^^^^^^^^^^^^^
->'Users' : string
->        : ^^^^^^
+>'Users' : "Users"
+>        : ^^^^^^^
 ><div/> : JSX.Element
 >       : ^^^^^^^^^^^
 >div : any
@@ -69,8 +69,8 @@ export class App extends React.Component<{}> {
                 ['Products', <div/>]
 >['Products', <div/>] : [string, JSX.Element]
 >                     : ^^^^^^^^^^^^^^^^^^^^^
->'Products' : string
->           : ^^^^^^
+>'Products' : "Products"
+>           : ^^^^^^^^^^
 ><div/> : JSX.Element
 >       : ^^^^^^^^^^^
 >div : any
diff --git a/tests/baselines/reference/jsxElementClassTooManyParams.types b/tests/baselines/reference/jsxElementClassTooManyParams.types
index 928b81ca8ad..fbf81a0b1d6 100644
--- a/tests/baselines/reference/jsxElementClassTooManyParams.types
+++ b/tests/baselines/reference/jsxElementClassTooManyParams.types
@@ -47,10 +47,10 @@ const elem = <ElemClass x={12} y={24} />
 >          : ^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >y : number
 >  : ^^^^^^
->24 : number
->   : ^^^^^^
+>24 : 24
+>   : ^^
 
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.types b/tests/baselines/reference/jsxEmitWithAttributes.types
index 4369f169c01..a32d6f9e988 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.types
+++ b/tests/baselines/reference/jsxEmitWithAttributes.types
@@ -116,8 +116,8 @@ function toCamelCase(text: string): string {
 >     : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === test.tsx ===
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.types b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
index ca4491e5bb5..021e638349d 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.types
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
@@ -119,8 +119,8 @@ function toCamelCase(text: string): string {
 >     : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === test.tsx ===
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.types b/tests/baselines/reference/jsxFactoryIdentifier.types
index 319e6601fbe..e65773328fe 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.types
+++ b/tests/baselines/reference/jsxFactoryIdentifier.types
@@ -116,8 +116,8 @@ function toCamelCase(text: string): string {
 >     : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === test.tsx ===
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
index 3410c028743..bee5a41234b 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
@@ -119,8 +119,8 @@ function toCamelCase(text: string): string {
 >     : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === test.tsx ===
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
index b9d665b269d..b44a81844e0 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
@@ -119,8 +119,8 @@ function toCamelCase(text: string): string {
 >     : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === test.tsx ===
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.types b/tests/baselines/reference/jsxFactoryQualifiedName.types
index 3def8a5dd67..82a05fceec8 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.types
@@ -116,8 +116,8 @@ function toCamelCase(text: string): string {
 >     : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 === test.tsx ===
diff --git a/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.types b/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.types
index f04f096df5f..3953193d3d6 100644
--- a/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.types
+++ b/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.types
@@ -28,8 +28,8 @@ export function Counter({ count = 0 }: CounterProps) {
 >        : ^         ^^            ^^^^^^^^^^^^^^^^
 >count : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     const [cnt, setCnt] = null as any;
 >cnt : any
diff --git a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
index 2a90015f4a1..a00e190bb8c 100644
--- a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
+++ b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
@@ -20,14 +20,14 @@ class TestObject {
     a: string = '';
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     b: number = 1;
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     c: () => void = () => { };
 >c : () => void
diff --git a/tests/baselines/reference/jsxIntrinsicDeclaredUsingTemplateLiteralTypeSignatures.types b/tests/baselines/reference/jsxIntrinsicDeclaredUsingTemplateLiteralTypeSignatures.types
index 02a07e5ce19..2d8b066a60e 100644
--- a/tests/baselines/reference/jsxIntrinsicDeclaredUsingTemplateLiteralTypeSignatures.types
+++ b/tests/baselines/reference/jsxIntrinsicDeclaredUsingTemplateLiteralTypeSignatures.types
@@ -34,8 +34,8 @@ declare namespace JSX {
 >       : ^^^
 >prop : number
 >     : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 <foobarbaz prop="literal"/>;
 ><foobarbaz prop="literal"/> : any
diff --git a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.types b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.types
index 03912fbc711..1ffb2dcf957 100644
--- a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.types
+++ b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.types
@@ -83,8 +83,8 @@ const a = <MyComp4 x={2}/>; // using `MyComp` as a component should error - it e
 >        : ^     ^^       ^^       ^^   ^^   ^^   ^^       ^^   ^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 const b = <MyComp3 x={2}/>; // using `MyComp` as a component should error - it expects more arguments than react provides
 >b : JSX.Element
@@ -95,8 +95,8 @@ const b = <MyComp3 x={2}/>; // using `MyComp` as a component should error - it e
 >        : ^     ^^       ^^       ^^   ^^   ^^   ^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 const c  = <MyComp2 x={2}/>; // Should be OK, `context` is allowed, per react rules
 >c : JSX.Element
@@ -107,8 +107,8 @@ const c  = <MyComp2 x={2}/>; // Should be OK, `context` is allowed, per react ru
 >        : ^     ^^       ^^       ^^   ^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 declare function MyTagWithOptionalNonJSXBits(props: MyProps, context: any, nonReactArg?: string): JSX.Element;
 >MyTagWithOptionalNonJSXBits : (props: MyProps, context: any, nonReactArg?: string) => JSX.Element
@@ -131,6 +131,6 @@ const d = <MyTagWithOptionalNonJSXBits x={2} />; // Technically OK, but probably
 >                            : ^     ^^       ^^       ^^   ^^           ^^^      ^^^^^           
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/jsxPartialSpread.types b/tests/baselines/reference/jsxPartialSpread.types
index 585d2a96bf4..fb1e8c62b94 100644
--- a/tests/baselines/reference/jsxPartialSpread.types
+++ b/tests/baselines/reference/jsxPartialSpread.types
@@ -51,7 +51,7 @@ export function Repro({ SelectProps = {} }: { SelectProps?: Partial<Parameters<t
 >       : ^ ^^                    ^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 >SelectProps : Partial<{ value?: unknown; }>
 >            : ^^^^^^^^^^^^^^^^^^       ^^^^
diff --git a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types
index eab4c9ab737..83782a6cae1 100644
--- a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types
+++ b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types
@@ -31,12 +31,12 @@ const props: Props = { a: 1, b: 1 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const Foo = (props: Props) => <div>{ props.a }</div>;
 >Foo : (props: Props) => JSX.Element
@@ -80,8 +80,8 @@ const a2 = <Foo d={1} {...props}></Foo>;
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >props : Props
 >      : ^^^^^
 >Foo : (props: Props) => JSX.Element
@@ -97,8 +97,8 @@ const b1 = <Foo a={1} {...props}></Foo>;
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >props : Props
 >      : ^^^^^
 >Foo : (props: Props) => JSX.Element
@@ -113,12 +113,12 @@ const b2 = <Foo a={1} b={2} {...props}></Foo>;
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >props : Props
 >      : ^^^^^
 >Foo : (props: Props) => JSX.Element
@@ -133,20 +133,20 @@ const b3 = <Foo a={1} d={1} {...props} {...{ d: 1 }}></Foo>;
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >props : Props
 >      : ^^^^^
 >{ d: 1 } : { d: number; }
 >         : ^^^^^^^^^^^^^^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >Foo : (props: Props) => JSX.Element
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 
@@ -159,24 +159,24 @@ const b4 = <Foo a={1} d={1} {...props} {...{ a: 1, d: 1 }}></Foo>;
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >props : Props
 >      : ^^^^^
 >{ a: 1, d: 1 } : { a: number; d: number; }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >Foo : (props: Props) => JSX.Element
 >    : ^     ^^     ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/keyRemappingKeyofResult.types b/tests/baselines/reference/keyRemappingKeyofResult.types
index 616b99535cc..50949e385da 100644
--- a/tests/baselines/reference/keyRemappingKeyofResult.types
+++ b/tests/baselines/reference/keyRemappingKeyofResult.types
@@ -8,8 +8,8 @@ const sym = Symbol("")
 >           : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 type Orig = { [k: string]: any, str: any, [sym]: any }
 >Orig : Orig
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 530ae7469c0..b2a18156304 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -357,8 +357,8 @@ function f10(shape: Shape) {
 >      : ^^^^^
 >"name" : "name"
 >       : ^^^^^^
->"rectangle" : string
->            : ^^^^^^
+>"rectangle" : "rectangle"
+>            : ^^^^^^^^^^^
 
     setProperty(shape, cond ? "width" : "height", 10);
 >setProperty(shape, cond ? "width" : "height", 10) : void
@@ -375,8 +375,8 @@ function f10(shape: Shape) {
 >        : ^^^^^^^
 >"height" : "height"
 >         : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     setProperty(shape, cond ? "name" : "visible", true);  // Technically not safe
 >setProperty(shape, cond ? "name" : "visible", true) : void
@@ -639,8 +639,8 @@ function f20(component: Component<Shape>) {
 >            : ^ ^^^^^^^^^^^^^^^^^^^^^^   ^^^^^     ^^^^^^^^^^^^^^^^^^^
 >"name" : "name"
 >       : ^^^^^^
->"rectangle" : string
->            : ^^^^^^
+>"rectangle" : "rectangle"
+>            : ^^^^^^^^^^^
 
     component.setProperty(cond ? "width" : "height", 10)
 >component.setProperty(cond ? "width" : "height", 10) : void
@@ -659,8 +659,8 @@ function f20(component: Component<Shape>) {
 >        : ^^^^^^^
 >"height" : "height"
 >         : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     component.setProperty(cond ? "name" : "visible", true);  // Technically not safe
 >component.setProperty(cond ? "name" : "visible", true) : void
@@ -774,16 +774,16 @@ function f31<K extends keyof Shape>(key: K) {
 >                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >width : number
 >      : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >height : number
 >       : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >visible : true
 >        : ^^^^
 >true : true
@@ -811,16 +811,16 @@ function f32<K extends "width" | "height">(key: K) {
 >                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >width : number
 >      : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >height : number
 >       : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >visible : true
 >        : ^^^^
 >true : true
@@ -1295,12 +1295,12 @@ function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1356,12 +1356,12 @@ function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T &
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1382,12 +1382,12 @@ function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T &
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1408,12 +1408,12 @@ function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T &
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1447,12 +1447,12 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1473,12 +1473,12 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1499,12 +1499,12 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ c: true } : { c: true; }
 >            : ^^^^^^^^^^^^
 >c : true
@@ -1538,18 +1538,18 @@ function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ a: 2, b: true } : { a: number; b: true; }
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >b : true
 >  : ^^^^
 >true : true
@@ -1568,18 +1568,18 @@ function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ a: 2, b: true } : { a: number; b: true; }
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >b : true
 >  : ^^^^
 >true : true
@@ -1719,8 +1719,8 @@ function f82() {
 >               : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x2 = f81({ a: { x: 42 } });  // number
 >x2 : number
@@ -1737,8 +1737,8 @@ function f82() {
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function f83<T extends { [x: string]: { x: any } }, K extends keyof T>(obj: T, key: K) {
@@ -1787,8 +1787,8 @@ function f84() {
 >               : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >"foo" : "foo"
 >      : ^^^^^
 
@@ -1807,8 +1807,8 @@ function f84() {
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >"bar" : "bar"
 >      : ^^^^^
 }
@@ -1906,28 +1906,28 @@ class C1 {
 >    : ^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         this["x"] = 42;
->this["x"] = 42 : number
->               : ^^^^^^
+>this["x"] = 42 : 42
+>               : ^^
 >this["x"] : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >"x" : "x"
 >    : ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         this.set("x", 42);
 >this.set("x", 42) : void
@@ -2567,8 +2567,8 @@ let c1 = new Component1({
         hello: ""
 >hello : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 });
 
@@ -2697,10 +2697,10 @@ let result = dispatchMethod<SomeMethodDescriptor>("someMethod", ["hello", 35]);
 >             : ^^^^^^^^^^^^
 >["hello", 35] : [string, number]
 >              : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->35 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>35 : 35
+>   : ^^
 
 // Repro from #13073
 
@@ -2731,8 +2731,8 @@ function addToMyThingy<S extends KeyTypes>(key: S) {
 >    : ^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 
 // Repro from #13102
@@ -3023,8 +3023,8 @@ class AnotherSampleClass<T> extends SampleClass<T & Foo> {
 >               : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
         super(merge(props, foo));
 >super(merge(props, foo)) : void
diff --git a/tests/baselines/reference/keyofAndIndexedAccess2.types b/tests/baselines/reference/keyofAndIndexedAccess2.types
index c577148607f..526abef4fd1 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess2.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess2.types
@@ -23,40 +23,40 @@ function f1(obj: { a: number, b: 0 | 1, c: string }, k0: 'a', k1: 'a' | 'b', k2:
 >   : ^^^^^^^^^^^^^^^
 
     obj[k0] = 1;
->obj[k0] = 1 : number
->            : ^^^^^^
+>obj[k0] = 1 : 1
+>            : ^
 >obj[k0] : number
 >        : ^^^^^^
 >obj : { a: number; b: 0 | 1; c: string; }
 >    : ^^^^^      ^^^^^     ^^^^^      ^^^
 >k0 : "a"
 >   : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     obj[k0] = 2;
->obj[k0] = 2 : number
->            : ^^^^^^
+>obj[k0] = 2 : 2
+>            : ^
 >obj[k0] : number
 >        : ^^^^^^
 >obj : { a: number; b: 0 | 1; c: string; }
 >    : ^^^^^      ^^^^^     ^^^^^      ^^^
 >k0 : "a"
 >   : ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     obj[k0] = 'x';  // Error
->obj[k0] = 'x' : string
->              : ^^^^^^
+>obj[k0] = 'x' : "x"
+>              : ^^^
 >obj[k0] : number
 >        : ^^^^^^
 >obj : { a: number; b: 0 | 1; c: string; }
 >    : ^^^^^      ^^^^^     ^^^^^      ^^^
 >k0 : "a"
 >   : ^^^
->'x' : string
->    : ^^^^^^
+>'x' : "x"
+>    : ^^^
 
     obj[k1] = 1;
 >obj[k1] = 1 : 1
@@ -95,40 +95,40 @@ function f1(obj: { a: number, b: 0 | 1, c: string }, k0: 'a', k1: 'a' | 'b', k2:
 >    : ^^^
 
     obj[k2] = 1;    // Error
->obj[k2] = 1 : number
->            : ^^^^^^
+>obj[k2] = 1 : 1
+>            : ^
 >obj[k2] : never
 >        : ^^^^^
 >obj : { a: number; b: 0 | 1; c: string; }
 >    : ^^^^^      ^^^^^     ^^^^^      ^^^
 >k2 : "a" | "b" | "c"
 >   : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     obj[k2] = 2;    // Error
->obj[k2] = 2 : number
->            : ^^^^^^
+>obj[k2] = 2 : 2
+>            : ^
 >obj[k2] : never
 >        : ^^^^^
 >obj : { a: number; b: 0 | 1; c: string; }
 >    : ^^^^^      ^^^^^     ^^^^^      ^^^
 >k2 : "a" | "b" | "c"
 >   : ^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     obj[k2] = 'x';  // Error
->obj[k2] = 'x' : string
->              : ^^^^^^
+>obj[k2] = 'x' : "x"
+>              : ^^^
 >obj[k2] : never
 >        : ^^^^^
 >obj : { a: number; b: 0 | 1; c: string; }
 >    : ^^^^^      ^^^^^     ^^^^^      ^^^
 >k2 : "a" | "b" | "c"
 >   : ^^^^^^^^^^^^^^^
->'x' : string
->    : ^^^^^^
+>'x' : "x"
+>    : ^^^
 }
 
 function f2<T extends { [key: string]: number }>(a: { x: number, y: number }, b: { [key: string]: number }, c: T, k: keyof T) {
@@ -232,28 +232,28 @@ function f2<T extends { [key: string]: number }>(a: { x: number, y: number }, b:
 >  : ^^^^^^^
 
     a.x = 1;
->a.x = 1 : number
->        : ^^^^^^
+>a.x = 1 : 1
+>        : ^
 >a.x : number
 >    : ^^^^^^
 >a : { x: number; y: number; }
 >  : ^^^^^      ^^^^^      ^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     b.x = 1;
->b.x = 1 : number
->        : ^^^^^^
+>b.x = 1 : 1
+>        : ^
 >b.x : number
 >    : ^^^^^^
 >b : { [key: string]: number; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     c.x = 1;  // Error, cannot write to index signature through constraint
 >c.x = 1 : 1
@@ -418,16 +418,16 @@ function f10<T extends Item, K extends keyof T>(obj: T, k1: string, k2: keyof It
 >    : ^^^
 
   obj[k2] = 123;  // Error
->obj[k2] = 123 : number
->              : ^^^^^^
+>obj[k2] = 123 : 123
+>              : ^^^
 >obj[k2] : never
 >        : ^^^^^
 >obj : T
 >    : ^
 >k2 : keyof Item
 >   : ^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
   obj[k3] = 123;  // Error
 >obj[k3] = 123 : 123
@@ -469,40 +469,40 @@ function f11<K extends keyof Dict>(obj: Dict, k1: keyof Dict, k2: K) {
 >   : ^
 
   obj.foo = 123;
->obj.foo = 123 : number
->              : ^^^^^^
+>obj.foo = 123 : 123
+>              : ^^^
 >obj.foo : number
 >        : ^^^^^^
 >obj : Dict
 >    : ^^^^
 >foo : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
   obj[k1] = 123;
->obj[k1] = 123 : number
->              : ^^^^^^
+>obj[k1] = 123 : 123
+>              : ^^^
 >obj[k1] : number
 >        : ^^^^^^
 >obj : Dict
 >    : ^^^^
 >k1 : string
 >   : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
   obj[k2] = 123;
->obj[k2] = 123 : number
->              : ^^^^^^
+>obj[k2] = 123 : 123
+>              : ^^^
 >obj[k2] : number
 >        : ^^^^^^
 >obj : Dict
 >    : ^^^^
 >k2 : K
 >   : ^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 }
 
 function f12<T extends Readonly<Dict>, K extends keyof T>(obj: T, k1: keyof Dict, k2: keyof T, k3: K) {
@@ -821,28 +821,28 @@ export class c {
 
   constructor() {
     this.a = "b";
->this.a = "b" : string
->             : ^^^^^^
+>this.a = "b" : "b"
+>             : ^^^
 >this.a : string
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : string
 >  : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
     this["a"] = "b";
->this["a"] = "b" : string
->                : ^^^^^^
+>this["a"] = "b" : "b"
+>                : ^^^
 >this["a"] : string
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >"a" : "a"
 >    : ^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
   }
 }
 
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.types b/tests/baselines/reference/keyofAndIndexedAccessErrors.types
index 7ea9cd77a10..e909c7b2fa8 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.types
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.types
@@ -267,8 +267,8 @@ function f10(shape: Shape) {
 >      : ^^^^^
 >"name" : "name"
 >       : ^^^^^^
->"rectangle" : string
->            : ^^^^^^
+>"rectangle" : "rectangle"
+>            : ^^^^^^^^^^^
 
     setProperty(shape, "size", 10);  // Error
 >setProperty(shape, "size", 10) : void
diff --git a/tests/baselines/reference/keyofDoesntContainSymbols.types b/tests/baselines/reference/keyofDoesntContainSymbols.types
index 59fd4132747..40da3f01eb4 100644
--- a/tests/baselines/reference/keyofDoesntContainSymbols.types
+++ b/tests/baselines/reference/keyofDoesntContainSymbols.types
@@ -77,8 +77,8 @@ const val = set(obj, 'str', '');
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 >'str' : "str"
 >      : ^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // string
 const valB = set(obj, 'num', '');
@@ -92,8 +92,8 @@ const valB = set(obj, 'num', '');
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 >'num' : "num"
 >      : ^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // Expect type error
 // Argument of type '""' is not assignable to parameter of type 'number'.
diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.types b/tests/baselines/reference/keyofIsLiteralContexualType.types
index 519c83773ca..e9622776829 100644
--- a/tests/baselines/reference/keyofIsLiteralContexualType.types
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.types
@@ -55,16 +55,16 @@ let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 >c : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 >["a", "c"] : ("a" | "c")[]
 >           : ^^^^^^^^^^^^^
 >"a" : "a"
diff --git a/tests/baselines/reference/knockout.types b/tests/baselines/reference/knockout.types
index 67391f332ca..8ae212db9b7 100644
--- a/tests/baselines/reference/knockout.types
+++ b/tests/baselines/reference/knockout.types
@@ -46,8 +46,8 @@
 >   : ^^^^^^^^^
 >observable : <T>(value: T) => ko.Observable<T>
 >           : ^ ^^     ^^ ^^^^^^^^^^^^^^^^^^   
->"Bob" : string
->      : ^^^^^^
+>"Bob" : "Bob"
+>      : ^^^^^
 
      age: ko.observable(37)
 >age : ko.Observable<number>
@@ -60,8 +60,8 @@
 >   : ^^^^^^^^^
 >observable : <T>(value: T) => ko.Observable<T>
 >           : ^ ^^     ^^ ^^^^^^^^^^^^^^^^^^   
->37 : number
->   : ^^^^^^
+>37 : 37
+>   : ^^
  }
  var x_v = o.name().length
 >x_v : number
@@ -102,8 +102,8 @@
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : ko.Observable<string>
 >     : ^^^^^^^^^^^^^^^^^^^^^
->"Robert" : string
->         : ^^^^^^
+>"Robert" : "Robert"
+>         : ^^^^^^^^
 
  var zz_v = o.name.N;
 >zz_v : number
diff --git a/tests/baselines/reference/lambdaParamTypes.types b/tests/baselines/reference/lambdaParamTypes.types
index bb4a74b3034..2bd67407567 100644
--- a/tests/baselines/reference/lambdaParamTypes.types
+++ b/tests/baselines/reference/lambdaParamTypes.types
@@ -38,22 +38,22 @@ var thing = create([{ name: "bob", id: 24 }, { name: "doug", id: 32 }]);
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"bob" : string
->      : ^^^^^^
+>"bob" : "bob"
+>      : ^^^^^
 >id : number
 >   : ^^^^^^
->24 : number
->   : ^^^^^^
+>24 : 24
+>   : ^^
 >{ name: "doug", id: 32 } : { name: string; id: number; }
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"doug" : string
+>"doug" : "doug"
 >       : ^^^^^^
 >id : number
 >   : ^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
 // Below should all be OK
 thing.doSomething((x, y) => x.name.charAt(0));      // x.name should be string, so should be OK
@@ -83,8 +83,8 @@ thing.doSomething((x, y) => x.name.charAt(0));      // x.name should be string,
 >     : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 thing.doSomething((x, y) => x.id.toExponential(0)); // x.id should be string, so should be OK
 >thing.doSomething((x, y) => x.id.toExponential(0)) : void
@@ -113,8 +113,8 @@ thing.doSomething((x, y) => x.id.toExponential(0)); // x.id should be string, so
 >   : ^^^^^^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 thing.doSomething((x, y) => y.name.charAt(0));      // x.name should be string, so should be OK
 >thing.doSomething((x, y) => y.name.charAt(0)) : void
@@ -143,8 +143,8 @@ thing.doSomething((x, y) => y.name.charAt(0));      // x.name should be string,
 >     : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 thing.doSomething((x, y) => y.id.toExponential(0)); // x.id should be string, so should be OK
 >thing.doSomething((x, y) => y.id.toExponential(0)) : void
@@ -173,8 +173,8 @@ thing.doSomething((x, y) => y.id.toExponential(0)); // x.id should be string, so
 >   : ^^^^^^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // Below should all be in error
 thing.doSomething((x, y) => x.foo); // no such property on x
diff --git a/tests/baselines/reference/lambdaPropSelf.types b/tests/baselines/reference/lambdaPropSelf.types
index 6cb41f5eab9..a5795b4f4cc 100644
--- a/tests/baselines/reference/lambdaPropSelf.types
+++ b/tests/baselines/reference/lambdaPropSelf.types
@@ -57,8 +57,8 @@ class Person {
 >         : ^^^^^^^^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->"New child" : string
->            : ^^^^^^
+>"New child" : "New child"
+>            : ^^^^^^^^^^^
 }
 
 
diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.types b/tests/baselines/reference/lastPropertyInLiteralWins.types
index 953c3b9a1d1..d75d6fe1620 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.types
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.types
@@ -23,8 +23,8 @@ function test(thing: Thing) {
 >      : ^^^^^
 >thunk : (str: string) => void
 >      : ^   ^^      ^^^^^    
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 }
 test({ // Should error, as last one wins, and is wrong type
 >test({ // Should error, as last one wins, and is wrong type    thunk: (str: string) => {},    thunk: (num: number) => {}}) : void
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types
index 7962daa4507..aa14b43f44c 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types
@@ -7,15 +7,14 @@ const x = require("./lateBoundAssignmentDeclarationSupport7.js");
 >require("./lateBoundAssignmentDeclarationSupport7.js") : typeof x
 >                                                       : ^^^^^^^^
 >require : any
->        : ^^^
 >"./lateBoundAssignmentDeclarationSupport7.js" : "./lateBoundAssignmentDeclarationSupport7.js"
 >                                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 const y = x.F["my-fake-sym"];
->y : any
->  : ^^^
->x.F["my-fake-sym"] : any
->                   : ^^^
+>y : string
+>  : ^^^^^^
+>x.F["my-fake-sym"] : string
+>                   : ^^^^^^
 >x.F : typeof x.F
 >    : ^^^^^^^^^^
 >x : typeof x
@@ -26,10 +25,10 @@ const y = x.F["my-fake-sym"];
 >              : ^^^^^^^^^^^^^
 
 const z = x.F[x.S];
->z : any
->  : ^^^
->x.F[x.S] : any
->         : ^^^
+>z : string
+>  : ^^^^^^
+>x.F[x.S] : string
+>         : ^^^^^^
 >x.F : typeof x.F
 >    : ^^^^^^^^^^
 >x : typeof x
@@ -65,8 +64,8 @@ function F() {
 F[_sym] = "ok";
 >F[_sym] = "ok" : "ok"
 >               : ^^^^
->F[_sym] : any
->        : ^^^
+>F[_sym] : string
+>        : ^^^^^^
 >F : typeof F
 >  : ^^^^^^^^
 >_sym : unique symbol
@@ -77,8 +76,8 @@ F[_sym] = "ok";
 F[_str] = "ok";
 >F[_str] = "ok" : "ok"
 >               : ^^^^
->F[_str] : any
->        : ^^^
+>F[_str] : string
+>        : ^^^^^^
 >F : typeof F
 >  : ^^^^^^^^
 >_str : "my-fake-sym"
diff --git a/tests/baselines/reference/lateBoundClassMemberAssignmentJS.types b/tests/baselines/reference/lateBoundClassMemberAssignmentJS.types
index 292f9b690ea..7bc923eebf8 100644
--- a/tests/baselines/reference/lateBoundClassMemberAssignmentJS.types
+++ b/tests/baselines/reference/lateBoundClassMemberAssignmentJS.types
@@ -8,7 +8,7 @@ const _sym = Symbol("_sym");
 >               : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"_sym" : string
+>"_sym" : "_sym"
 >       : ^^^^^^
 
 export class MyClass {
diff --git a/tests/baselines/reference/lateBoundClassMemberAssignmentJS3.types b/tests/baselines/reference/lateBoundClassMemberAssignmentJS3.types
index 097f71053bc..d5f23f26935 100644
--- a/tests/baselines/reference/lateBoundClassMemberAssignmentJS3.types
+++ b/tests/baselines/reference/lateBoundClassMemberAssignmentJS3.types
@@ -8,7 +8,7 @@ const _sym = Symbol("_sym");
 >               : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"_sym" : string
+>"_sym" : "_sym"
 >       : ^^^^^^
 
 export class MyClass {
diff --git a/tests/baselines/reference/lateBoundFunctionMemberAssignmentDeclarations.types b/tests/baselines/reference/lateBoundFunctionMemberAssignmentDeclarations.types
index 3b7e6cb6bf1..bdfd18445c7 100644
--- a/tests/baselines/reference/lateBoundFunctionMemberAssignmentDeclarations.types
+++ b/tests/baselines/reference/lateBoundFunctionMemberAssignmentDeclarations.types
@@ -28,8 +28,8 @@ const _private = Symbol();
 foo[_private] = "ok";
 >foo[_private] = "ok" : "ok"
 >                     : ^^^^
->foo[_private] : any
->              : ^^^
+>foo[_private] : string
+>              : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >_private : unique symbol
@@ -40,8 +40,8 @@ foo[_private] = "ok";
 const x: string = foo[_private];
 >x : string
 >  : ^^^^^^
->foo[_private] : any
->              : ^^^
+>foo[_private] : string
+>              : ^^^^^^
 >foo : typeof foo
 >    : ^^^^^^^^^^
 >_private : unique symbol
diff --git a/tests/baselines/reference/lateBoundMethodNameAssigmentJS.types b/tests/baselines/reference/lateBoundMethodNameAssigmentJS.types
index 5e9c03906a1..5b27e8e4813 100644
--- a/tests/baselines/reference/lateBoundMethodNameAssigmentJS.types
+++ b/tests/baselines/reference/lateBoundMethodNameAssigmentJS.types
@@ -8,7 +8,7 @@ const _symbol = Symbol("_sym");
 >               : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"_sym" : string
+>"_sym" : "_sym"
 >       : ^^^^^^
 
 export class MyClass {
diff --git a/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.types b/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.types
index 4d78d7abb58..5547ace4bb0 100644
--- a/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.types
+++ b/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.types
@@ -16,8 +16,8 @@ export const a = async () => (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/private").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/letAsIdentifier.types b/tests/baselines/reference/letAsIdentifier.types
index e0c8dafb6ca..61cb257f344 100644
--- a/tests/baselines/reference/letAsIdentifier.types
+++ b/tests/baselines/reference/letAsIdentifier.types
@@ -14,12 +14,12 @@ var a = 10;
 >   : ^^
 
 let = 30;
->let = 30 : number
->         : ^^^^^^
+>let = 30 : 30
+>         : ^^
 >let : number
 >    : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
 let
 a;
diff --git a/tests/baselines/reference/letAsIdentifierInStrictMode.types b/tests/baselines/reference/letAsIdentifierInStrictMode.types
index bd6e17a899b..97f0bc0de08 100644
--- a/tests/baselines/reference/letAsIdentifierInStrictMode.types
+++ b/tests/baselines/reference/letAsIdentifierInStrictMode.types
@@ -18,12 +18,12 @@ var a = 10;
 >   : ^^
 
 let = 30;
->let = 30 : number
->         : ^^^^^^
+>let = 30 : 30
+>         : ^^
 >let : number
 >    : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
 let
 a;
diff --git a/tests/baselines/reference/letDeclarations-access.types b/tests/baselines/reference/letDeclarations-access.types
index af4fa2d6474..5333c76f3e9 100644
--- a/tests/baselines/reference/letDeclarations-access.types
+++ b/tests/baselines/reference/letDeclarations-access.types
@@ -10,12 +10,12 @@ let x = 0
 // No errors
 
 x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x += 2;
 >x += 2 : number
diff --git a/tests/baselines/reference/letDeclarations-es5-1.types b/tests/baselines/reference/letDeclarations-es5-1.types
index 73f34e67ab6..cde05165b26 100644
--- a/tests/baselines/reference/letDeclarations-es5-1.types
+++ b/tests/baselines/reference/letDeclarations-es5-1.types
@@ -24,8 +24,8 @@
     let l8: number = 23;
 >l8 : number
 >   : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
     let l9 = 0, l10 :string = "", l11 = null;
 >l9 : number
@@ -34,7 +34,7 @@
 >  : ^
 >l10 : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >l11 : any
 
diff --git a/tests/baselines/reference/letDeclarations-es5.types b/tests/baselines/reference/letDeclarations-es5.types
index ee07f4519f3..f7e902488ae 100644
--- a/tests/baselines/reference/letDeclarations-es5.types
+++ b/tests/baselines/reference/letDeclarations-es5.types
@@ -24,8 +24,8 @@ let l7 = false;
 let l8: number = 23;
 >l8 : number
 >   : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
 let l9 = 0, l10 :string = "", l11 = null;
 >l9 : number
@@ -34,8 +34,8 @@ let l9 = 0, l10 :string = "", l11 = null;
 >  : ^
 >l10 : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >l11 : any
 
 for(let l11 in {}) { }
diff --git a/tests/baselines/reference/letDeclarations.types b/tests/baselines/reference/letDeclarations.types
index e7f693631b2..4c0a80b15ad 100644
--- a/tests/baselines/reference/letDeclarations.types
+++ b/tests/baselines/reference/letDeclarations.types
@@ -24,8 +24,8 @@ let l7 = false;
 let l8: number = 23;
 >l8 : number
 >   : ^^^^^^
->23 : number
->   : ^^^^^^
+>23 : 23
+>   : ^^
 
 let l9 = 0, l10 :string = "", l11 = null;
 >l9 : number
@@ -34,8 +34,8 @@ let l9 = 0, l10 :string = "", l11 = null;
 >  : ^
 >l10 : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >l11 : any
 
 for(let l11 in {}) { }
diff --git a/tests/baselines/reference/libMembers.types b/tests/baselines/reference/libMembers.types
index 7ac4e19f53a..8ea3173bf90 100644
--- a/tests/baselines/reference/libMembers.types
+++ b/tests/baselines/reference/libMembers.types
@@ -16,8 +16,8 @@ s.substring(0);
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 s.substring(3,4);
 >s.substring(3,4) : string
@@ -28,10 +28,10 @@ s.substring(3,4);
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 s.subby(12);   // error unresolved
 >s.subby(12) : any
@@ -54,8 +54,8 @@ String.fromCharCode(12);
 >       : ^^^^^^^^^^^^^^^^^
 >fromCharCode : (...codes: number[]) => string
 >             : ^^^^     ^^        ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 module M {
 >M : typeof M
diff --git a/tests/baselines/reference/libReferenceNoLib.types b/tests/baselines/reference/libReferenceNoLib.types
index 48e6695a3f5..1989431f89d 100644
--- a/tests/baselines/reference/libReferenceNoLib.types
+++ b/tests/baselines/reference/libReferenceNoLib.types
@@ -25,6 +25,6 @@ export const elem: HTMLElement = { field: 'a' };
 >               : ^^^^^^^^^^^^^^^^^^
 >field : string
 >      : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/libReferenceNoLibBundle.types b/tests/baselines/reference/libReferenceNoLibBundle.types
index b9f7601f738..266db3a269d 100644
--- a/tests/baselines/reference/libReferenceNoLibBundle.types
+++ b/tests/baselines/reference/libReferenceNoLibBundle.types
@@ -25,6 +25,6 @@ export const elem: HTMLElement = { field: 'a' };
 >               : ^^^^^^^^^^^^^^^^^^
 >field : string
 >      : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.types b/tests/baselines/reference/libTypeScriptOverrideSimple.types
index 36ad708142a..c3bfa65acdc 100644
--- a/tests/baselines/reference/libTypeScriptOverrideSimple.types
+++ b/tests/baselines/reference/libTypeScriptOverrideSimple.types
@@ -14,8 +14,8 @@ const a: ABC = { abc: "Hello" }
 >                 : ^^^^^^^^^^^^^^^^
 >abc : string
 >    : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 // This should fail because libdom has been replaced
 // by the module above ^
diff --git a/tests/baselines/reference/libTypeScriptOverrideSimpleConfig.types b/tests/baselines/reference/libTypeScriptOverrideSimpleConfig.types
index f28e707649c..363a70424a7 100644
--- a/tests/baselines/reference/libTypeScriptOverrideSimpleConfig.types
+++ b/tests/baselines/reference/libTypeScriptOverrideSimpleConfig.types
@@ -9,8 +9,8 @@ const a: ABC = { abc: "Hello" }
 >                 : ^^^^^^^^^^^^^^^^
 >abc : string
 >    : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 // This should fail because libdom has been replaced
 // by the module above ^
diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.types b/tests/baselines/reference/libTypeScriptSubfileResolving.types
index 9df30ae8370..0206e085ec1 100644
--- a/tests/baselines/reference/libTypeScriptSubfileResolving.types
+++ b/tests/baselines/reference/libTypeScriptSubfileResolving.types
@@ -17,8 +17,8 @@ const a: DOMIterable = { abc: "Hello" }
 >                 : ^^^^^^^^^^^^^^^^
 >abc : string
 >    : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 // This should fail because libdom has been replaced
 // by the module above ^
diff --git a/tests/baselines/reference/libTypeScriptSubfileResolvingConfig.types b/tests/baselines/reference/libTypeScriptSubfileResolvingConfig.types
index 59362b91ddc..0a31aad2bda 100644
--- a/tests/baselines/reference/libTypeScriptSubfileResolvingConfig.types
+++ b/tests/baselines/reference/libTypeScriptSubfileResolvingConfig.types
@@ -9,8 +9,8 @@ const a: DOMIterable = { abc: "Hello" }
 >                 : ^^^^^^^^^^^^^^^^
 >abc : string
 >    : ^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 // This should fail because libdom has been replaced
 // by the module above ^
diff --git a/tests/baselines/reference/library_ArraySlice.types b/tests/baselines/reference/library_ArraySlice.types
index 2ca0b6f781d..574ab69e3bb 100644
--- a/tests/baselines/reference/library_ArraySlice.types
+++ b/tests/baselines/reference/library_ArraySlice.types
@@ -29,8 +29,8 @@ Array.prototype.slice(0);
 >          : ^^^^^
 >slice : (start?: number, end?: number) => any[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Array.prototype.slice(0, 1);
 >Array.prototype.slice(0, 1) : any[]
@@ -45,8 +45,8 @@ Array.prototype.slice(0, 1);
 >          : ^^^^^
 >slice : (start?: number, end?: number) => any[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/library_DatePrototypeProperties.types b/tests/baselines/reference/library_DatePrototypeProperties.types
index 64471bc05b8..06e512759b8 100644
--- a/tests/baselines/reference/library_DatePrototypeProperties.types
+++ b/tests/baselines/reference/library_DatePrototypeProperties.types
@@ -378,8 +378,8 @@ Date.prototype.setTime(0);
 >          : ^^^^
 >setTime : (time: number) => number
 >        : ^    ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setMilliseconds(0);
 >Date.prototype.setMilliseconds(0) : number
@@ -394,8 +394,8 @@ Date.prototype.setMilliseconds(0);
 >          : ^^^^
 >setMilliseconds : (ms: number) => number
 >                : ^  ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCMilliseconds(0);
 >Date.prototype.setUTCMilliseconds(0) : number
@@ -410,8 +410,8 @@ Date.prototype.setUTCMilliseconds(0);
 >          : ^^^^
 >setUTCMilliseconds : (ms: number) => number
 >                   : ^  ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setSeconds(0);
 >Date.prototype.setSeconds(0) : number
@@ -426,8 +426,8 @@ Date.prototype.setSeconds(0);
 >          : ^^^^
 >setSeconds : (sec: number, ms?: number) => number
 >           : ^   ^^      ^^  ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCSeconds(0);
 >Date.prototype.setUTCSeconds(0) : number
@@ -442,8 +442,8 @@ Date.prototype.setUTCSeconds(0);
 >          : ^^^^
 >setUTCSeconds : (sec: number, ms?: number) => number
 >              : ^   ^^      ^^  ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setMinutes(0);
 >Date.prototype.setMinutes(0) : number
@@ -458,8 +458,8 @@ Date.prototype.setMinutes(0);
 >          : ^^^^
 >setMinutes : (min: number, sec?: number, ms?: number) => number
 >           : ^   ^^      ^^   ^^^      ^^  ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCMinutes(0);
 >Date.prototype.setUTCMinutes(0) : number
@@ -474,8 +474,8 @@ Date.prototype.setUTCMinutes(0);
 >          : ^^^^
 >setUTCMinutes : (min: number, sec?: number, ms?: number) => number
 >              : ^   ^^      ^^   ^^^      ^^  ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setHours(0);
 >Date.prototype.setHours(0) : number
@@ -490,8 +490,8 @@ Date.prototype.setHours(0);
 >          : ^^^^
 >setHours : (hours: number, min?: number, sec?: number, ms?: number) => number
 >         : ^     ^^      ^^   ^^^      ^^   ^^^      ^^  ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCHours(0);
 >Date.prototype.setUTCHours(0) : number
@@ -506,8 +506,8 @@ Date.prototype.setUTCHours(0);
 >          : ^^^^
 >setUTCHours : (hours: number, min?: number, sec?: number, ms?: number) => number
 >            : ^     ^^      ^^   ^^^      ^^   ^^^      ^^  ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setDate(0);
 >Date.prototype.setDate(0) : number
@@ -522,8 +522,8 @@ Date.prototype.setDate(0);
 >          : ^^^^
 >setDate : (date: number) => number
 >        : ^    ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCDate(0);
 >Date.prototype.setUTCDate(0) : number
@@ -538,8 +538,8 @@ Date.prototype.setUTCDate(0);
 >          : ^^^^
 >setUTCDate : (date: number) => number
 >           : ^    ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setMonth(0);
 >Date.prototype.setMonth(0) : number
@@ -554,8 +554,8 @@ Date.prototype.setMonth(0);
 >          : ^^^^
 >setMonth : (month: number, date?: number) => number
 >         : ^     ^^      ^^    ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCMonth(0);
 >Date.prototype.setUTCMonth(0) : number
@@ -570,8 +570,8 @@ Date.prototype.setUTCMonth(0);
 >          : ^^^^
 >setUTCMonth : (month: number, date?: number) => number
 >            : ^     ^^      ^^    ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setFullYear(0);
 >Date.prototype.setFullYear(0) : number
@@ -586,8 +586,8 @@ Date.prototype.setFullYear(0);
 >          : ^^^^
 >setFullYear : (year: number, month?: number, date?: number) => number
 >            : ^    ^^      ^^     ^^^      ^^    ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.setUTCFullYear(0);
 >Date.prototype.setUTCFullYear(0) : number
@@ -602,8 +602,8 @@ Date.prototype.setUTCFullYear(0);
 >          : ^^^^
 >setUTCFullYear : (year: number, month?: number, date?: number) => number
 >               : ^    ^^      ^^     ^^^      ^^    ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 Date.prototype.toUTCString();
 >Date.prototype.toUTCString() : string
diff --git a/tests/baselines/reference/library_RegExpExecArraySlice.types b/tests/baselines/reference/library_RegExpExecArraySlice.types
index 7888b1792d7..8a59c840865 100644
--- a/tests/baselines/reference/library_RegExpExecArraySlice.types
+++ b/tests/baselines/reference/library_RegExpExecArraySlice.types
@@ -25,8 +25,8 @@ regExpExecArrayValue.slice(0);
 >                     : ^^^^^^^^^^^^^^^
 >slice : (start?: number, end?: number) => string[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 regExpExecArrayValue.slice(0,1);
 >regExpExecArrayValue.slice(0,1) : string[]
@@ -37,8 +37,8 @@ regExpExecArrayValue.slice(0,1);
 >                     : ^^^^^^^^^^^^^^^
 >slice : (start?: number, end?: number) => string[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/library_StringSlice.types b/tests/baselines/reference/library_StringSlice.types
index 6e181a62b87..e72f564759d 100644
--- a/tests/baselines/reference/library_StringSlice.types
+++ b/tests/baselines/reference/library_StringSlice.types
@@ -29,8 +29,8 @@ String.prototype.slice(0);
 >          : ^^^^^^
 >slice : (start?: number, end?: number) => string
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 String.prototype.slice(0,1);
 >String.prototype.slice(0,1) : string
@@ -45,8 +45,8 @@ String.prototype.slice(0,1);
 >          : ^^^^^^
 >slice : (start?: number, end?: number) => string
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/literalTypesWidenInParameterPosition.types b/tests/baselines/reference/literalTypesWidenInParameterPosition.types
index 85d321dafdf..44e751a1ef4 100644
--- a/tests/baselines/reference/literalTypesWidenInParameterPosition.types
+++ b/tests/baselines/reference/literalTypesWidenInParameterPosition.types
@@ -30,16 +30,16 @@ class D {
 >  : ^
 
         this.widen = 6; // ok
->this.widen = 6 : number
->               : ^^^^^^
+>this.widen = 6 : 6
+>               : ^
 >this.widen : number
 >           : ^^^^^^
 >this : this
 >     : ^^^^
 >widen : number
 >      : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
     }
 }
 new D(7); // ok
@@ -47,6 +47,6 @@ new D(7); // ok
 >         : ^
 >D : typeof D
 >  : ^^^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
diff --git a/tests/baselines/reference/localTypes1.types b/tests/baselines/reference/localTypes1.types
index d1caade9d5b..577f7bcdd24 100644
--- a/tests/baselines/reference/localTypes1.types
+++ b/tests/baselines/reference/localTypes1.types
@@ -486,40 +486,40 @@ function f6() {
 >  : ^^^^^^^^
 
             x.a = "a";
->x.a = "a" : string
->          : ^^^^^^
+>x.a = "a" : "a"
+>          : ^^^
 >x.a : string
 >    : ^^^^^^
 >x : C
 >  : ^
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
             x.b = "b";
->x.b = "b" : string
->          : ^^^^^^
+>x.b = "b" : "b"
+>          : ^^^
 >x.b : string
 >    : ^^^^^^
 >x : C
 >  : ^
 >b : string
 >  : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
             x.c = "c";
->x.c = "c" : string
->          : ^^^^^^
+>x.c = "c" : "c"
+>          : ^^^
 >x.c : string
 >    : ^^^^^^
 >x : C
 >  : ^
 >c : string
 >  : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"c" : "c"
+>    : ^^^
 
             return x;
 >x : C
diff --git a/tests/baselines/reference/localTypes2.types b/tests/baselines/reference/localTypes2.types
index 33217379bd3..48936633b86 100644
--- a/tests/baselines/reference/localTypes2.types
+++ b/tests/baselines/reference/localTypes2.types
@@ -38,10 +38,10 @@ function f1() {
 >              : ^
 >C : typeof C
 >  : ^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
     let x = v.x;
 >x : number
@@ -99,8 +99,8 @@ function f2() {
 >      : ^^^^^^^^
 >f : (x: number) => typeof C
 >  : ^ ^^      ^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     let v = new C(20);
 >v : C
@@ -109,8 +109,8 @@ function f2() {
 >          : ^
 >C : typeof C
 >  : ^^^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     let x = v.x;
 >x : number
@@ -172,10 +172,10 @@ function f3() {
 >          : ^^^^^^^^
 >f : (x: number, y: number) => typeof C
 >  : ^ ^^      ^^ ^^      ^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
     let v = new C();
 >v : C
diff --git a/tests/baselines/reference/localTypes3.types b/tests/baselines/reference/localTypes3.types
index cfd70977839..56690b06f80 100644
--- a/tests/baselines/reference/localTypes3.types
+++ b/tests/baselines/reference/localTypes3.types
@@ -38,10 +38,10 @@ function f1() {
 >                   : ^^^^^^^^^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x = v.x;
 >x : number
@@ -99,8 +99,8 @@ function f2() {
 >      : ^^^^^^^^
 >f : <X>(x: X) => typeof C
 >  : ^ ^^ ^^ ^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     let v = new C("hello");
 >v : f<number>.C<string>
@@ -109,8 +109,8 @@ function f2() {
 >               : ^^^^^^^^^^^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x = v.x;
 >x : number
@@ -172,10 +172,10 @@ function f3() {
 >               : ^^^^^^^^
 >f : <X, Y>(x: X, y: Y) => typeof C
 >  : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let v = new C();
 >v : f<number, string>.C
diff --git a/tests/baselines/reference/localTypes4.types b/tests/baselines/reference/localTypes4.types
index 21246d07fcb..bab7b13a03a 100644
--- a/tests/baselines/reference/localTypes4.types
+++ b/tests/baselines/reference/localTypes4.types
@@ -66,16 +66,16 @@ function f4() {
 >  : ^
 
     v.x = 10;
->v.x = 10 : number
->         : ^^^^^^
+>v.x = 10 : 10
+>         : ^^
 >v.x : number
 >    : ^^^^^^
 >v : T
 >  : ^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     if (true) {
 >true : true
@@ -90,29 +90,29 @@ function f4() {
 >  : ^
 
         v.x = "hello";
->v.x = "hello" : string
->              : ^^^^^^
+>v.x = "hello" : "hello"
+>              : ^^^^^^^
 >v.x : string
 >    : ^^^^^^
 >v : T
 >  : ^
 >x : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
     }
     else {
         v.x = 20;
->v.x = 20 : number
->         : ^^^^^^
+>v.x = 20 : 20
+>         : ^^
 >v.x : number
 >    : ^^^^^^
 >v : T
 >  : ^
 >x : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/localesObjectArgument.types b/tests/baselines/reference/localesObjectArgument.types
index 079a6a58d4f..05d31c0d859 100644
--- a/tests/baselines/reference/localesObjectArgument.types
+++ b/tests/baselines/reference/localesObjectArgument.types
@@ -74,10 +74,10 @@ const readonlyLocales: Readonly<string[]> = ['de-DE', 'ja-JP'];
 >                : ^^^^^^^^^^^^^^^^^
 >['de-DE', 'ja-JP'] : string[]
 >                   : ^^^^^^^^
->'de-DE' : string
->        : ^^^^^^
->'ja-JP' : string
->        : ^^^^^^
+>'de-DE' : "de-DE"
+>        : ^^^^^^^
+>'ja-JP' : "ja-JP"
+>        : ^^^^^^^
 
 now.toLocaleString(enUS);
 >now.toLocaleString(enUS) : string
diff --git a/tests/baselines/reference/logicalAssignment1(target=es2015).types b/tests/baselines/reference/logicalAssignment1(target=es2015).types
index c5ec10765cc..7fe6073534a 100644
--- a/tests/baselines/reference/logicalAssignment1(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment1(target=es2015).types
@@ -39,53 +39,53 @@ declare let i: 0 | 1 | 42
 
 
 a &&= "foo"
->a &&= "foo" : string | undefined
->            : ^^^^^^^^^^^^^^^^^^
+>a &&= "foo" : "" | "foo" | undefined
+>            : ^^^^^^^^^^^^^^^^^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 b ||= "foo"
 >b ||= "foo" : string
 >            : ^^^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 c ??= "foo"
 >c ??= "foo" : string
 >            : ^^^^^^
 >c : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 
 d &&= 42
->d &&= 42 : number | undefined
+>d &&= 42 : 0 | 42 | undefined
 >         : ^^^^^^^^^^^^^^^^^^
 >d : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 e ||= 42
 >e ||= 42 : number
 >         : ^^^^^^
 >e : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 f ??= 42
 >f ??= 42 : number
 >         : ^^^^^^
 >f : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 g &&= 42
 >g &&= 42 : 0 | 42
diff --git a/tests/baselines/reference/logicalAssignment1(target=es2020).types b/tests/baselines/reference/logicalAssignment1(target=es2020).types
index c5ec10765cc..7fe6073534a 100644
--- a/tests/baselines/reference/logicalAssignment1(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment1(target=es2020).types
@@ -39,53 +39,53 @@ declare let i: 0 | 1 | 42
 
 
 a &&= "foo"
->a &&= "foo" : string | undefined
->            : ^^^^^^^^^^^^^^^^^^
+>a &&= "foo" : "" | "foo" | undefined
+>            : ^^^^^^^^^^^^^^^^^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 b ||= "foo"
 >b ||= "foo" : string
 >            : ^^^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 c ??= "foo"
 >c ??= "foo" : string
 >            : ^^^^^^
 >c : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 
 d &&= 42
->d &&= 42 : number | undefined
+>d &&= 42 : 0 | 42 | undefined
 >         : ^^^^^^^^^^^^^^^^^^
 >d : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 e ||= 42
 >e ||= 42 : number
 >         : ^^^^^^
 >e : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 f ??= 42
 >f ??= 42 : number
 >         : ^^^^^^
 >f : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 g &&= 42
 >g &&= 42 : 0 | 42
diff --git a/tests/baselines/reference/logicalAssignment1(target=es2021).types b/tests/baselines/reference/logicalAssignment1(target=es2021).types
index c5ec10765cc..7fe6073534a 100644
--- a/tests/baselines/reference/logicalAssignment1(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment1(target=es2021).types
@@ -39,53 +39,53 @@ declare let i: 0 | 1 | 42
 
 
 a &&= "foo"
->a &&= "foo" : string | undefined
->            : ^^^^^^^^^^^^^^^^^^
+>a &&= "foo" : "" | "foo" | undefined
+>            : ^^^^^^^^^^^^^^^^^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 b ||= "foo"
 >b ||= "foo" : string
 >            : ^^^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 c ??= "foo"
 >c ??= "foo" : string
 >            : ^^^^^^
 >c : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 
 d &&= 42
->d &&= 42 : number | undefined
+>d &&= 42 : 0 | 42 | undefined
 >         : ^^^^^^^^^^^^^^^^^^
 >d : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 e ||= 42
 >e ||= 42 : number
 >         : ^^^^^^
 >e : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 f ??= 42
 >f ??= 42 : number
 >         : ^^^^^^
 >f : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 g &&= 42
 >g &&= 42 : 0 | 42
diff --git a/tests/baselines/reference/logicalAssignment1(target=esnext).types b/tests/baselines/reference/logicalAssignment1(target=esnext).types
index c5ec10765cc..7fe6073534a 100644
--- a/tests/baselines/reference/logicalAssignment1(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment1(target=esnext).types
@@ -39,53 +39,53 @@ declare let i: 0 | 1 | 42
 
 
 a &&= "foo"
->a &&= "foo" : string | undefined
->            : ^^^^^^^^^^^^^^^^^^
+>a &&= "foo" : "" | "foo" | undefined
+>            : ^^^^^^^^^^^^^^^^^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 b ||= "foo"
 >b ||= "foo" : string
 >            : ^^^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 c ??= "foo"
 >c ??= "foo" : string
 >            : ^^^^^^
 >c : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 
 d &&= 42
->d &&= 42 : number | undefined
+>d &&= 42 : 0 | 42 | undefined
 >         : ^^^^^^^^^^^^^^^^^^
 >d : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 e ||= 42
 >e ||= 42 : number
 >         : ^^^^^^
 >e : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 f ??= 42
 >f ??= 42 : number
 >         : ^^^^^^
 >f : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 g &&= 42
 >g &&= 42 : 0 | 42
diff --git a/tests/baselines/reference/logicalAssignment11(target=es2015).types b/tests/baselines/reference/logicalAssignment11(target=es2015).types
index cc6eacd6ceb..c74b8e2a65b 100644
--- a/tests/baselines/reference/logicalAssignment11(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment11(target=es2015).types
@@ -24,8 +24,8 @@ d ?? (d = x ?? "x")
 >         : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 d.length;
 >d.length : number
@@ -48,8 +48,8 @@ e ??= x ?? "x"
 >         : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 e.length
 >e.length : number
diff --git a/tests/baselines/reference/logicalAssignment11(target=es2020).types b/tests/baselines/reference/logicalAssignment11(target=es2020).types
index cc6eacd6ceb..c74b8e2a65b 100644
--- a/tests/baselines/reference/logicalAssignment11(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment11(target=es2020).types
@@ -24,8 +24,8 @@ d ?? (d = x ?? "x")
 >         : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 d.length;
 >d.length : number
@@ -48,8 +48,8 @@ e ??= x ?? "x"
 >         : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 e.length
 >e.length : number
diff --git a/tests/baselines/reference/logicalAssignment11(target=esnext).types b/tests/baselines/reference/logicalAssignment11(target=esnext).types
index cc6eacd6ceb..c74b8e2a65b 100644
--- a/tests/baselines/reference/logicalAssignment11(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment11(target=esnext).types
@@ -24,8 +24,8 @@ d ?? (d = x ?? "x")
 >         : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 d.length;
 >d.length : number
@@ -48,8 +48,8 @@ e ??= x ?? "x"
 >         : ^^^^^^
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 e.length
 >e.length : number
diff --git a/tests/baselines/reference/logicalAssignment4(target=es2015).types b/tests/baselines/reference/logicalAssignment4(target=es2015).types
index 68eedf235f9..542737560da 100644
--- a/tests/baselines/reference/logicalAssignment4(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment4(target=es2015).types
@@ -22,8 +22,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -47,8 +47,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -74,8 +74,8 @@ function foo3(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo4(results: number[] | undefined) {
@@ -101,8 +101,8 @@ function foo4(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 interface ThingWithOriginal {
diff --git a/tests/baselines/reference/logicalAssignment4(target=es2020).types b/tests/baselines/reference/logicalAssignment4(target=es2020).types
index 68eedf235f9..542737560da 100644
--- a/tests/baselines/reference/logicalAssignment4(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment4(target=es2020).types
@@ -22,8 +22,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -47,8 +47,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -74,8 +74,8 @@ function foo3(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo4(results: number[] | undefined) {
@@ -101,8 +101,8 @@ function foo4(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 interface ThingWithOriginal {
diff --git a/tests/baselines/reference/logicalAssignment4(target=es2021).types b/tests/baselines/reference/logicalAssignment4(target=es2021).types
index 68eedf235f9..542737560da 100644
--- a/tests/baselines/reference/logicalAssignment4(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment4(target=es2021).types
@@ -22,8 +22,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -47,8 +47,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -74,8 +74,8 @@ function foo3(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo4(results: number[] | undefined) {
@@ -101,8 +101,8 @@ function foo4(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 interface ThingWithOriginal {
diff --git a/tests/baselines/reference/logicalAssignment4(target=esnext).types b/tests/baselines/reference/logicalAssignment4(target=esnext).types
index 68eedf235f9..542737560da 100644
--- a/tests/baselines/reference/logicalAssignment4(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment4(target=esnext).types
@@ -22,8 +22,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -47,8 +47,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -74,8 +74,8 @@ function foo3(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo4(results: number[] | undefined) {
@@ -101,8 +101,8 @@ function foo4(results: number[] | undefined) {
 >        : ^^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 interface ThingWithOriginal {
diff --git a/tests/baselines/reference/logicalAssignment5(target=es2015).types b/tests/baselines/reference/logicalAssignment5(target=es2015).types
index d7371dcc190..e91ab1007d2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment5(target=es2015).types
@@ -28,8 +28,8 @@ function foo1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo2 (f?: (a: number) => void) {
@@ -59,8 +59,8 @@ function foo2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo3 (f?: (a: number) => void) {
@@ -90,8 +90,8 @@ function foo3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar1 (f?: (a: number) => void) {
@@ -133,8 +133,8 @@ function bar1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar2 (f?: (a: number) => void) {
@@ -176,8 +176,8 @@ function bar2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar3 (f?: (a: number) => void) {
@@ -219,7 +219,7 @@ function bar3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment5(target=es2020).types b/tests/baselines/reference/logicalAssignment5(target=es2020).types
index d7371dcc190..e91ab1007d2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment5(target=es2020).types
@@ -28,8 +28,8 @@ function foo1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo2 (f?: (a: number) => void) {
@@ -59,8 +59,8 @@ function foo2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo3 (f?: (a: number) => void) {
@@ -90,8 +90,8 @@ function foo3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar1 (f?: (a: number) => void) {
@@ -133,8 +133,8 @@ function bar1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar2 (f?: (a: number) => void) {
@@ -176,8 +176,8 @@ function bar2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar3 (f?: (a: number) => void) {
@@ -219,7 +219,7 @@ function bar3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment5(target=es2021).types b/tests/baselines/reference/logicalAssignment5(target=es2021).types
index d7371dcc190..e91ab1007d2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment5(target=es2021).types
@@ -28,8 +28,8 @@ function foo1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo2 (f?: (a: number) => void) {
@@ -59,8 +59,8 @@ function foo2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo3 (f?: (a: number) => void) {
@@ -90,8 +90,8 @@ function foo3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar1 (f?: (a: number) => void) {
@@ -133,8 +133,8 @@ function bar1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar2 (f?: (a: number) => void) {
@@ -176,8 +176,8 @@ function bar2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar3 (f?: (a: number) => void) {
@@ -219,7 +219,7 @@ function bar3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment5(target=esnext).types b/tests/baselines/reference/logicalAssignment5(target=esnext).types
index d7371dcc190..e91ab1007d2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment5(target=esnext).types
@@ -28,8 +28,8 @@ function foo1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo2 (f?: (a: number) => void) {
@@ -59,8 +59,8 @@ function foo2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function foo3 (f?: (a: number) => void) {
@@ -90,8 +90,8 @@ function foo3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar1 (f?: (a: number) => void) {
@@ -133,8 +133,8 @@ function bar1 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar2 (f?: (a: number) => void) {
@@ -176,8 +176,8 @@ function bar2 (f?: (a: number) => void) {
 >      : ^^^^
 >f : (a: number) => void
 >  : ^ ^^      ^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function bar3 (f?: (a: number) => void) {
@@ -219,7 +219,7 @@ function bar3 (f?: (a: number) => void) {
 >      : ^^^^
 >f : ((a: number) => void) | undefined
 >  : ^^ ^^      ^^^^^    ^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment6(target=es2015).types b/tests/baselines/reference/logicalAssignment6(target=es2015).types
index 6076cba7d02..87969d3cd40 100644
--- a/tests/baselines/reference/logicalAssignment6(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment6(target=es2015).types
@@ -30,8 +30,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -63,8 +63,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -96,7 +96,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment6(target=es2020).types b/tests/baselines/reference/logicalAssignment6(target=es2020).types
index 6076cba7d02..87969d3cd40 100644
--- a/tests/baselines/reference/logicalAssignment6(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment6(target=es2020).types
@@ -30,8 +30,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -63,8 +63,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -96,7 +96,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment6(target=es2021).types b/tests/baselines/reference/logicalAssignment6(target=es2021).types
index 6076cba7d02..87969d3cd40 100644
--- a/tests/baselines/reference/logicalAssignment6(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment6(target=es2021).types
@@ -30,8 +30,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -63,8 +63,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -96,7 +96,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment6(target=esnext).types b/tests/baselines/reference/logicalAssignment6(target=esnext).types
index 6076cba7d02..87969d3cd40 100644
--- a/tests/baselines/reference/logicalAssignment6(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment6(target=esnext).types
@@ -30,8 +30,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -63,8 +63,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -96,7 +96,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment7(target=es2015).types b/tests/baselines/reference/logicalAssignment7(target=es2015).types
index 32a7e1ea6d1..6a7181fda2c 100644
--- a/tests/baselines/reference/logicalAssignment7(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment7(target=es2015).types
@@ -28,8 +28,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -59,8 +59,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -90,7 +90,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment7(target=es2020).types b/tests/baselines/reference/logicalAssignment7(target=es2020).types
index 32a7e1ea6d1..6a7181fda2c 100644
--- a/tests/baselines/reference/logicalAssignment7(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment7(target=es2020).types
@@ -28,8 +28,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -59,8 +59,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -90,7 +90,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment7(target=es2021).types b/tests/baselines/reference/logicalAssignment7(target=es2021).types
index 32a7e1ea6d1..6a7181fda2c 100644
--- a/tests/baselines/reference/logicalAssignment7(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment7(target=es2021).types
@@ -28,8 +28,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -59,8 +59,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -90,7 +90,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment7(target=esnext).types b/tests/baselines/reference/logicalAssignment7(target=esnext).types
index 32a7e1ea6d1..6a7181fda2c 100644
--- a/tests/baselines/reference/logicalAssignment7(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment7(target=esnext).types
@@ -28,8 +28,8 @@ function foo1(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined, results1: number[] | undefined) {
@@ -59,8 +59,8 @@ function foo2(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined, results1: number[] | undefined) {
@@ -90,7 +90,7 @@ function foo3(results: number[] | undefined, results1: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: never[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment8(target=es2015).types b/tests/baselines/reference/logicalAssignment8(target=es2015).types
index 4178d659f6d..081e3da57c9 100644
--- a/tests/baselines/reference/logicalAssignment8(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment8(target=es2015).types
@@ -36,8 +36,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -69,8 +69,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -102,7 +102,7 @@ function foo3(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment8(target=es2020).types b/tests/baselines/reference/logicalAssignment8(target=es2020).types
index 4178d659f6d..081e3da57c9 100644
--- a/tests/baselines/reference/logicalAssignment8(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment8(target=es2020).types
@@ -36,8 +36,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -69,8 +69,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -102,7 +102,7 @@ function foo3(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment8(target=es2021).types b/tests/baselines/reference/logicalAssignment8(target=es2021).types
index 4178d659f6d..081e3da57c9 100644
--- a/tests/baselines/reference/logicalAssignment8(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment8(target=es2021).types
@@ -36,8 +36,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -69,8 +69,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -102,7 +102,7 @@ function foo3(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalAssignment8(target=esnext).types b/tests/baselines/reference/logicalAssignment8(target=esnext).types
index 4178d659f6d..081e3da57c9 100644
--- a/tests/baselines/reference/logicalAssignment8(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment8(target=esnext).types
@@ -36,8 +36,8 @@ function foo1(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo2(results: number[] | undefined) {
@@ -69,8 +69,8 @@ function foo2(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 function foo3(results: number[] | undefined) {
@@ -102,7 +102,7 @@ function foo3(results: number[] | undefined) {
 >   : ^^^^^^^
 >push : (...items: number[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
index d9a784c7cc9..c259d3feeb5 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types
index 93a62a3f3a8..bcb7b7d5fd8 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -203,8 +203,8 @@ var ResultIsBoolean12 = !STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // multiple ! operator
 var ResultIsBoolean13 = !!STRING;
diff --git a/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types b/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types
index 1637955e72a..038b0d1c12a 100644
--- a/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types
+++ b/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types
@@ -17,8 +17,8 @@ var r: { a: string } = { a: '', b: 123 } || { a: '', b: true };
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
 >123 : 123
@@ -27,8 +27,8 @@ var r: { a: string } = { a: '', b: 123 } || { a: '', b: true };
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >b : boolean
 >  : ^^^^^^^
 >true : true
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.types b/tests/baselines/reference/looseThisTypeInFunctions.types
index 3af86afcdc4..094d633a0bf 100644
--- a/tests/baselines/reference/looseThisTypeInFunctions.types
+++ b/tests/baselines/reference/looseThisTypeInFunctions.types
@@ -169,8 +169,8 @@ let o2: I = {
     n: 1001,
 >n : number
 >  : ^^^^^^
->1001 : number
->     : ^^^^^^
+>1001 : 1001
+>     : ^^^^
 
     explicitThis: function (m) {
 >explicitThis : (this: I, m: number) => any
@@ -215,8 +215,8 @@ let n = x(12); // callee:void doesn't match this:I
 >      : ^^^^^^
 >x : (this: I, m: number) => number
 >  : ^    ^^^^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 let u: Unused;
 >u : Unused
@@ -241,8 +241,8 @@ n = y(12); // ok, callee:void matches this:any
 >      : ^^^^^^
 >y : (m: number) => number
 >  : ^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
 >c.explicitVoid = c.implicitThis : (m: number) => number
diff --git a/tests/baselines/reference/mapConstructor.types b/tests/baselines/reference/mapConstructor.types
index 1700f3ee71b..8d1b342d04b 100644
--- a/tests/baselines/reference/mapConstructor.types
+++ b/tests/baselines/reference/mapConstructor.types
@@ -16,16 +16,16 @@ const potentiallyUndefinedIterable = [['1', 1], ['2', 2]] as Iterable<[string, n
 >                     : ^^^^^^^^^^^^^^^^^^
 >['1', 1] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'1' : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>'1' : "1"
+>    : ^^^
+>1 : 1
+>  : ^
 >['2', 2] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'2' : string
->    : ^^^^^^
->2 : number
->  : ^^^^^^
+>'2' : "2"
+>    : ^^^
+>2 : 2
+>  : ^
 
 new Map(potentiallyUndefinedIterable);
 >new Map(potentiallyUndefinedIterable) : Map<string, number>
@@ -44,16 +44,16 @@ const potentiallyNullIterable = [['1', 1], ['2', 2]] as Iterable<[string, number
 >                     : ^^^^^^^^^^^^^^^^^^
 >['1', 1] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'1' : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>'1' : "1"
+>    : ^^^
+>1 : 1
+>  : ^
 >['2', 2] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'2' : string
->    : ^^^^^^
->2 : number
->  : ^^^^^^
+>'2' : "2"
+>    : ^^^
+>2 : 2
+>  : ^
 
 new Map(potentiallyNullIterable);
 >new Map(potentiallyNullIterable) : Map<string, number>
diff --git a/tests/baselines/reference/mapGroupBy.types b/tests/baselines/reference/mapGroupBy.types
index 6d4442dab9f..090af0f19de 100644
--- a/tests/baselines/reference/mapGroupBy.types
+++ b/tests/baselines/reference/mapGroupBy.types
@@ -14,12 +14,12 @@ const basic = Map.groupBy([0, 2, 8], x => x < 5 ? 'small' : 'large');
 >        : ^ ^^ ^^     ^^           ^^           ^^                             ^^^^^           
 >[0, 2, 8] : number[]
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->8 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>2 : 2
+>  : ^
+>8 : 8
+>  : ^
 >x => x < 5 ? 'small' : 'large' : (x: number) => "small" | "large"
 >                               : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/mapOnTupleTypes01.types b/tests/baselines/reference/mapOnTupleTypes01.types
index d799d20f1d7..bfaea018e6f 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.types
+++ b/tests/baselines/reference/mapOnTupleTypes01.types
@@ -38,8 +38,8 @@ let numTuple: [number] = [1];
 >         : ^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 export let a = numTuple.map(x => x * x);
 >a : number[]
@@ -70,30 +70,30 @@ let numNum: [number, number] = [    100,     100];
 >       : ^^^^^^^^^^^^^^^^
 >[    100,     100] : [number, number]
 >                   : ^^^^^^^^^^^^^^^^
->100 : number
->    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
+>100 : 100
+>    : ^^^
 
 let strStr: [string, string] = ["hello", "hello"];
 >strStr : [string, string]
 >       : ^^^^^^^^^^^^^^^^
 >["hello", "hello"] : [string, string]
 >                   : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let numStr: [number, string] = [    100, "hello"];
 >numStr : [number, string]
 >       : ^^^^^^^^^^^^^^^^
 >[    100, "hello"] : [number, string]
 >                   : ^^^^^^^^^^^^^^^^
->100 : number
->    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>100 : 100
+>    : ^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 export let b = numNum.map(n => n * n);
 >b : number[]
@@ -140,8 +140,8 @@ export let c = strStr.map(s => s.charCodeAt(0));
 >  : ^^^^^^
 >charCodeAt : (index: number) => number
 >           : ^     ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 export let d = numStr.map(x => x);
 >d : (string | number)[]
@@ -168,12 +168,12 @@ let numNumNum: [number, number, number] = [1, 2, 3];
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 export let e = numNumNum.map(n => n * n);
 >e : number[]
@@ -204,14 +204,14 @@ let numNumNumNum: [number, number, number, number] = [1, 2, 3, 4];
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, 4] : [number, number, number, number]
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 export let f = numNumNumNum.map(n => n * n);
 >f : number[]
@@ -242,16 +242,16 @@ let numNumNumNumNum: [number, number, number, number, number] = [1, 2, 3, 4, 5];
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, 4, 5] : [number, number, number, number, number]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
 
 export let g = numNumNumNumNum.map(n => n * n);
 >g : number[]
@@ -283,18 +283,18 @@ let numNumNumNumNumNum: [number, number, number, number, number, number] = [1, 2
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3, 4, 5, 6] : [number, number, number, number, number, number]
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 export let h = numNumNumNumNum.map(n => n * n);
 >h : number[]
diff --git a/tests/baselines/reference/mappedTypeAsClauses.types b/tests/baselines/reference/mappedTypeAsClauses.types
index 3dc55921368..8d30c223f29 100644
--- a/tests/baselines/reference/mappedTypeAsClauses.types
+++ b/tests/baselines/reference/mappedTypeAsClauses.types
@@ -164,8 +164,8 @@ const e1: T1 = {
     foo: "hello"
 >foo : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 };
 type T2 = keyof T1;
diff --git a/tests/baselines/reference/mappedTypeContextualTypesApplied.types b/tests/baselines/reference/mappedTypeContextualTypesApplied.types
index 90cb8807370..25ddfbb721e 100644
--- a/tests/baselines/reference/mappedTypeContextualTypesApplied.types
+++ b/tests/baselines/reference/mappedTypeContextualTypesApplied.types
@@ -76,8 +76,8 @@ mapped1({foo: s => 42});
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 mapped2({foo: s => 42});
 >mapped2({foo: s => 42}) : void
@@ -92,8 +92,8 @@ mapped2({foo: s => 42});
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 mapped3({foo: s => 42});
 >mapped3({foo: s => 42}) : void
@@ -108,8 +108,8 @@ mapped3({foo: s => 42});
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 mapped4({foo: s => 42});
 >mapped4({foo: s => 42}) : void
diff --git a/tests/baselines/reference/mappedTypeErrors.types b/tests/baselines/reference/mappedTypeErrors.types
index e16617f7640..32839343182 100644
--- a/tests/baselines/reference/mappedTypeErrors.types
+++ b/tests/baselines/reference/mappedTypeErrors.types
@@ -215,18 +215,18 @@ function f20() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ x: 1 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
 >x2 : { x: number; y: number; }
@@ -239,22 +239,22 @@ function f20() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
 >x3 : { x: number; y: number; }
@@ -267,22 +267,22 @@ function f20() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ x: 1, y: 1, z: 1 } : { x: number; y: number; z: number; }
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >z : number
 >  : ^^^^^^
 >1 : 1
@@ -304,18 +304,18 @@ function f21() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ x: 1 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let x2 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1 });
 >x2 : { x: number; y: number; }
@@ -328,22 +328,22 @@ function f21() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let x3 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
 >x3 : { x: number; y: number; }
@@ -356,22 +356,22 @@ function f21() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ x: 1, y: 1, z: 1 } : { x: number; y: number; z: number; }
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >z : number
 >  : ^^^^^^
 >1 : 1
@@ -429,12 +429,12 @@ let foo: Foo = { a: "hello", b: 42 };
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >b : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 setState(foo, { a: "test", b: 43 })
 >setState(foo, { a: "test", b: 43 }) : void
@@ -447,12 +447,12 @@ setState(foo, { a: "test", b: 43 })
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 >b : number
 >  : ^^^^^^
->43 : number
->   : ^^^^^^
+>43 : 43
+>   : ^^
 
 setState(foo, { a: "hi" });
 >setState(foo, { a: "hi" }) : void
@@ -465,8 +465,8 @@ setState(foo, { a: "hi" });
 >            : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 setState(foo, { b: undefined });
 >setState(foo, { b: undefined }) : void
@@ -594,12 +594,12 @@ c.setState({ a: "test", b: 43 });
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 >b : number
 >  : ^^^^^^
->43 : number
->   : ^^^^^^
+>43 : 43
+>   : ^^
 
 c.setState({ a: "hi" });
 >c.setState({ a: "hi" }) : void
@@ -614,8 +614,8 @@ c.setState({ a: "hi" });
 >            : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 c.setState({ b: undefined });
 >c.setState({ b: undefined }) : void
@@ -704,8 +704,8 @@ let x1: T2 = { a: 'no' };  // Error
 >            : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
 let x2: Partial<T2> = { a: 'no' }; // Error
 >x2 : Partial<T2>
@@ -714,8 +714,8 @@ let x2: Partial<T2> = { a: 'no' }; // Error
 >            : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
 let x3: { [P in keyof T2]: T2[P]} = { a: 'no' };  // Error
 >x3 : { [x: string]: any; a?: number | undefined; }
@@ -724,8 +724,8 @@ let x3: { [P in keyof T2]: T2[P]} = { a: 'no' };  // Error
 >            : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
 // Repro from #13044
 
@@ -757,8 +757,8 @@ let o: O = {x: 5, y: false};
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : false
 >  : ^^^^^
 >false : false
@@ -777,8 +777,8 @@ let f: Foo2<O, 'x'> = {
 >       : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
     pt: {x: 7, y: false},
 >pt : { x: number; y: boolean; }
diff --git a/tests/baselines/reference/mappedTypeGenericWithKnownKeys.types b/tests/baselines/reference/mappedTypeGenericWithKnownKeys.types
index 3ee64fa31d2..20495f1892e 100644
--- a/tests/baselines/reference/mappedTypeGenericWithKnownKeys.types
+++ b/tests/baselines/reference/mappedTypeGenericWithKnownKeys.types
@@ -20,16 +20,16 @@ function test<Shape extends Record<string, string>>(shape: Shape, key: keyof Sha
 >   : ^^
 
     obj.knownLiteralKey = 1;
->obj.knownLiteralKey = 1 : number
->                        : ^^^^^^
+>obj.knownLiteralKey = 1 : 1
+>                        : ^
 >obj.knownLiteralKey : number
 >                    : ^^^^^^
 >obj : Record<keyof Shape | "knownLiteralKey", number>
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >knownLiteralKey : number
 >                : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     obj[key] = 2;
 >obj[key] = 2 : 2
@@ -64,8 +64,8 @@ function test<Shape extends Record<string, string>>(shape: Shape, key: keyof Sha
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >'' as string : string
 >             : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >4 : 4
 >  : ^
 }
diff --git a/tests/baselines/reference/mappedTypeIndexedAccess.types b/tests/baselines/reference/mappedTypeIndexedAccess.types
index 9fb0600d003..351619b94f5 100644
--- a/tests/baselines/reference/mappedTypeIndexedAccess.types
+++ b/tests/baselines/reference/mappedTypeIndexedAccess.types
@@ -53,8 +53,8 @@ let pair1: Pair<FooBar> = {
     value: 3
 >value : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 };
 
@@ -74,8 +74,8 @@ let pair2: Pairs<FooBar>[keyof FooBar] = {
     value: 3
 >value : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 };
 
diff --git a/tests/baselines/reference/mappedTypeInferenceErrors.types b/tests/baselines/reference/mappedTypeInferenceErrors.types
index 6eea610dc29..0120c7e85bb 100644
--- a/tests/baselines/reference/mappedTypeInferenceErrors.types
+++ b/tests/baselines/reference/mappedTypeInferenceErrors.types
@@ -35,12 +35,12 @@ foo({
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     computed: {
 >computed : { bar(): number; baz: number; }
@@ -63,8 +63,8 @@ foo({
 >    : ^^^^^^^
 
             return 42;
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         },
         baz: 42
diff --git a/tests/baselines/reference/mappedTypeModifiers.types b/tests/baselines/reference/mappedTypeModifiers.types
index fe5cb837708..1532573a83e 100644
--- a/tests/baselines/reference/mappedTypeModifiers.types
+++ b/tests/baselines/reference/mappedTypeModifiers.types
@@ -340,8 +340,8 @@ function f1(x: Partial<Foo>) {
 >  : ^^^^^^^^^^^^
 >"other" : "other"
 >        : ^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
 }
diff --git a/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types b/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types
index f1db2b5c14b..f049a463f73 100644
--- a/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types
+++ b/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types
@@ -56,12 +56,12 @@ const v = chain({a: 1, b: 2}).mapValues(square).value();
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >mapValues : <U>(func: (v: number) => U) => Chainable<{ a: U; b: U; }>
 >          : ^ ^^    ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >square : (x: number) => number
diff --git a/tests/baselines/reference/mappedTypeNotMistakenlyHomomorphic.types b/tests/baselines/reference/mappedTypeNotMistakenlyHomomorphic.types
index 24fcfa23d2b..34d14a1817f 100644
--- a/tests/baselines/reference/mappedTypeNotMistakenlyHomomorphic.types
+++ b/tests/baselines/reference/mappedTypeNotMistakenlyHomomorphic.types
@@ -61,12 +61,12 @@ const gen2TypeA: Gen2<ABC.A> = { v:  "I am A", a: "" };
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >v : string
 >  : ^^^^^^
->"I am A" : string
->         : ^^^^^^
+>"I am A" : "I am A"
+>         : ^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 const gen2TypeB: Gen2<ABC.B> = { v:  "I am B", b: "" };
 >gen2TypeB : Gen2<ABC.B>
@@ -77,12 +77,12 @@ const gen2TypeB: Gen2<ABC.B> = { v:  "I am B", b: "" };
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >v : string
 >  : ^^^^^^
->"I am B" : string
->         : ^^^^^^
+>"I am B" : "I am B"
+>         : ^^^^^^^^
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 // 'v' ???
 type K = keyof Gen2<ABC.A>;
diff --git a/tests/baselines/reference/mappedTypeOverlappingStringEnumKeys.types b/tests/baselines/reference/mappedTypeOverlappingStringEnumKeys.types
index beee8f03583..0e64a5bb840 100644
--- a/tests/baselines/reference/mappedTypeOverlappingStringEnumKeys.types
+++ b/tests/baselines/reference/mappedTypeOverlappingStringEnumKeys.types
@@ -100,8 +100,8 @@ const catMap: CatMap = {
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >address : string
 >        : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     { type: AlienAnimalTypes.CAT, planet: "" }
 >{ type: AlienAnimalTypes.CAT, planet: "" } : { type: AlienAnimalTypes; planet: string; }
@@ -116,8 +116,8 @@ const catMap: CatMap = {
 >    : ^^^^^^^^^^^^^^^^
 >planet : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
   ],
   dog: [] as never[]
diff --git a/tests/baselines/reference/mappedTypePartialNonHomomorphicBaseConstraint.types b/tests/baselines/reference/mappedTypePartialNonHomomorphicBaseConstraint.types
index 8f1623b624a..fc454584074 100644
--- a/tests/baselines/reference/mappedTypePartialNonHomomorphicBaseConstraint.types
+++ b/tests/baselines/reference/mappedTypePartialNonHomomorphicBaseConstraint.types
@@ -20,8 +20,8 @@ class Model<D> {
 >     : ^^^^^^^^
 >["some base error"] : string[]
 >                    : ^^^^^^^^
->"some base error" : string
->                  : ^^^^^^
+>"some base error" : "some base error"
+>                  : ^^^^^^^^^^^^^^^^^
   }
 }
 
diff --git a/tests/baselines/reference/mappedTypeRelationships.types b/tests/baselines/reference/mappedTypeRelationships.types
index 50c85f1fd18..ea45a0eb304 100644
--- a/tests/baselines/reference/mappedTypeRelationships.types
+++ b/tests/baselines/reference/mappedTypeRelationships.types
@@ -1079,8 +1079,8 @@ function f90<T extends { x: number }>() {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 function f<T extends { x: {} }>(): Partial<T> {
diff --git a/tests/baselines/reference/mappedTypeUnionConstraintInferences.types b/tests/baselines/reference/mappedTypeUnionConstraintInferences.types
index fef84496ed2..c38179b52c2 100644
--- a/tests/baselines/reference/mappedTypeUnionConstraintInferences.types
+++ b/tests/baselines/reference/mappedTypeUnionConstraintInferences.types
@@ -54,7 +54,7 @@ export let a = doSomething_Actual({ prop: "test" });
 >                 : ^^^^^^^^^^^^^^^^^
 >prop : string
 >     : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 a = {} // should be fine, equivalent to below
@@ -76,7 +76,7 @@ export let b = doSomething_Expected({ prop: "test" });
 >                 : ^^^^^^^^^^^^^^^^^
 >prop : string
 >     : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 b = {} // fine
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
index d9ab183b493..d1225adb765 100644
--- a/tests/baselines/reference/mappedTypes2.types
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -188,8 +188,8 @@ function f0(s1: Shape, s2: Shape) {
 >                   : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"circle" : string
->         : ^^^^^^
+>"circle" : "circle"
+>         : ^^^^^^^^
 
     assign(s2, { width: 10, height: 20 });
 >assign(s2, { width: 10, height: 20 }) : void
@@ -202,12 +202,12 @@ function f0(s1: Shape, s2: Shape) {
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >width : number
 >      : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >height : number
 >       : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 }
 
 function f1(shape: Shape) {
@@ -365,8 +365,8 @@ function f5(shape: Shape) {
 >      : ^^^^^^^^^^^^^
 >set : (value: number) => void
 >    : ^     ^^^^^^^^^^^^^    
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 function f6(shape: DeepReadonly<Shape>) {
diff --git a/tests/baselines/reference/mappedTypes6.types b/tests/baselines/reference/mappedTypes6.types
index 3793f3c166a..6474f0a30a8 100644
--- a/tests/baselines/reference/mappedTypes6.types
+++ b/tests/baselines/reference/mappedTypes6.types
@@ -495,8 +495,8 @@ x1 = { a: 1 };  // Error
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x1 = { a: 1, b: 1 };
 >x1 = { a: 1, b: 1 } : { a: number; b: number; }
@@ -507,12 +507,12 @@ x1 = { a: 1, b: 1 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x1 = { a: 1, b: 1, c: 1 };
 >x1 = { a: 1, b: 1, c: 1 } : { a: number; b: number; c: number; }
@@ -523,16 +523,16 @@ x1 = { a: 1, b: 1, c: 1 };
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x1 = { a: 1, b: 1, c: 1, d: 1 };
 >x1 = { a: 1, b: 1, c: 1, d: 1 } : { a: number; b: number; c: number; d: number; }
@@ -543,20 +543,20 @@ x1 = { a: 1, b: 1, c: 1, d: 1 };
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 declare let x2: Required<Foo>;
 >x2 : Required<Foo>
@@ -603,8 +603,8 @@ x2 = { a: 1 };  // Error
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x2 = { a: 1, b: 1 };  // Error
 >x2 = { a: 1, b: 1 } : { a: number; b: number; }
@@ -615,12 +615,12 @@ x2 = { a: 1, b: 1 };  // Error
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x2 = { a: 1, b: 1, c: 1 };  // Error
 >x2 = { a: 1, b: 1, c: 1 } : { a: number; b: number; c: number; }
@@ -631,16 +631,16 @@ x2 = { a: 1, b: 1, c: 1 };  // Error
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x2 = { a: 1, b: 1, c: 1, d: 1 };
 >x2 = { a: 1, b: 1, c: 1, d: 1 } : { a: number; b: number; c: number; d: number; }
@@ -651,20 +651,20 @@ x2 = { a: 1, b: 1, c: 1, d: 1 };
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 type Bar = {
 >Bar : Bar
@@ -684,16 +684,16 @@ declare let x3: Bar;
 >   : ^^^
 
 x3.a = 1;
->x3.a = 1 : number
->         : ^^^^^^
+>x3.a = 1 : 1
+>         : ^
 >x3.a : number
 >     : ^^^^^^
 >x3 : Bar
 >   : ^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x3.b = 1;  // Error
 >x3.b = 1 : 1
@@ -740,26 +740,26 @@ declare let x5: Readwrite<Bar>;
 >   : ^^^^^^^^^^^^^^
 
 x5.a = 1;
->x5.a = 1 : number
->         : ^^^^^^
+>x5.a = 1 : 1
+>         : ^
 >x5.a : number
 >     : ^^^^^^
 >x5 : Readwrite<Bar>
 >   : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x5.b = 1;
->x5.b = 1 : number
->         : ^^^^^^
+>x5.b = 1 : 1
+>         : ^
 >x5.b : number
 >     : ^^^^^^
 >x5 : Readwrite<Bar>
 >   : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/mappedTypesGenericTuples2.types b/tests/baselines/reference/mappedTypesGenericTuples2.types
index efca6879be0..07694eba180 100644
--- a/tests/baselines/reference/mappedTypesGenericTuples2.types
+++ b/tests/baselines/reference/mappedTypesGenericTuples2.types
@@ -58,8 +58,8 @@ Promise.all([getT<string>(), ...getT<any>()]).then((result) => {
 >       : ^^^^^^^^^^^^^^^^^^
 >slice : (start?: number, end?: number) => any[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   tail satisfies string[]; // ok
 >tail satisfies string[] : any[]
diff --git a/tests/baselines/reference/matchReturnTypeInAllBranches.types b/tests/baselines/reference/matchReturnTypeInAllBranches.types
index 2b65b7c8f11..d947eecc020 100644
--- a/tests/baselines/reference/matchReturnTypeInAllBranches.types
+++ b/tests/baselines/reference/matchReturnTypeInAllBranches.types
@@ -49,16 +49,16 @@ class IceCreamMonster {
 >               : ^^^^^^
 
         this.iceCreamRemaining = 100;
->this.iceCreamRemaining = 100 : number
->                             : ^^^^^^
+>this.iceCreamRemaining = 100 : 100
+>                             : ^^^
 >this.iceCreamRemaining : number
 >                       : ^^^^^^
 >this : this
 >     : ^^^^
 >iceCreamRemaining : number
 >                  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
         this.wantsSprinkles = wantsSprinkles;
 >this.wantsSprinkles = wantsSprinkles : boolean
@@ -133,16 +133,16 @@ class IceCreamMonster {
 >  : ^
         {
             this.iceCreamRemaining = 0;
->this.iceCreamRemaining = 0 : number
->                           : ^^^^^^
+>this.iceCreamRemaining = 0 : 0
+>                           : ^
 >this.iceCreamRemaining : number
 >                       : ^^^^^^
 >this : this
 >     : ^^^^
 >iceCreamRemaining : number
 >                  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
             return false;
 >false : false
@@ -169,12 +169,12 @@ cookieMonster = new IceCreamMonster("Chocolate Chip", false, "COOOOOKIE", "Cooki
 >                                                                            : ^^^^^^^^^^^^^^^
 >IceCreamMonster : typeof IceCreamMonster
 >                : ^^^^^^^^^^^^^^^^^^^^^^
->"Chocolate Chip" : string
->                 : ^^^^^^
+>"Chocolate Chip" : "Chocolate Chip"
+>                 : ^^^^^^^^^^^^^^^^
 >false : false
 >      : ^^^^^
->"COOOOOKIE" : string
->            : ^^^^^^
->"Cookie Monster" : string
->                 : ^^^^^^
+>"COOOOOKIE" : "COOOOOKIE"
+>            : ^^^^^^^^^^^
+>"Cookie Monster" : "Cookie Monster"
+>                 : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/matchingOfObjectLiteralConstraints.types b/tests/baselines/reference/matchingOfObjectLiteralConstraints.types
index 51d1f231423..76588f2860b 100644
--- a/tests/baselines/reference/matchingOfObjectLiteralConstraints.types
+++ b/tests/baselines/reference/matchingOfObjectLiteralConstraints.types
@@ -20,9 +20,9 @@ foo2({ y: "foo" }, "foo");
 >             : ^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"foo" : "foo"
+>      : ^^^^^
  
 
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.types b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
index 7fc52c88011..9c98ccb9d21 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.types
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
@@ -19,8 +19,8 @@ WinJS.Promise.timeout(10);
 >        : ^^^^^^^^^^^^^^^^^^^^
 >timeout : (delay: number) => WinJS.Promise
 >        : ^     ^^      ^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 === memberAccessMustUseModuleInstances_0.ts ===
 export class Promise {
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
index 4018e0325f3..bef0bd6187d 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
@@ -227,8 +227,8 @@ var r = c.foo(1); // error
 >  : ^
 >foo : { (x: number): any; (x: number, y: string): any; }
 >    : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var d: D<number>;
 >d : D<number>
@@ -245,8 +245,8 @@ var r2 = d.foo(2); // error
 >  : ^^^^^^^^^
 >foo : { (x: number): any; (x: number, y: number): any; }
 >    : ^^^ ^^      ^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var r3 = C.foo(1); // error
 >r3 : any
@@ -259,8 +259,8 @@ var r3 = C.foo(1); // error
 >  : ^^^^^^^^
 >foo : { (x: number): any; (x: number, y: string): any; }
 >    : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r4 = D.bar(''); // error
 >r4 : any
@@ -273,6 +273,6 @@ var r4 = D.bar(''); // error
 >  : ^^^^^^^^
 >bar : { (x: "hi"): any; (x: string): any; (x: number, y: number): any; }
 >    : ^^^ ^^    ^^^^^^^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
index a8f48362d1a..47ca9abf3fc 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
@@ -320,8 +320,8 @@ var r = c.foo(1); // error
 >  : ^
 >foo : { (x: number): any; (x: number, y: string): any; }
 >    : ^^^ ^^      ^^^^^^^^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var d: D<number>;
 >d : D<number>
@@ -338,6 +338,6 @@ var r2 = d.foo(2); // error
 >  : ^^^^^^^^^
 >foo : { (x: number): any; (x: number, y: number): any; }
 >    : ^^^ ^^      ^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/mergeSymbolReexportInterface.types b/tests/baselines/reference/mergeSymbolReexportInterface.types
index 5295b6cfbff..99cc91fc848 100644
--- a/tests/baselines/reference/mergeSymbolReexportInterface.types
+++ b/tests/baselines/reference/mergeSymbolReexportInterface.types
@@ -20,8 +20,8 @@ const y : C = { s: '' }
 >          : ^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
  
 === ./a.d.ts ===
diff --git a/tests/baselines/reference/mergeSymbolReexportedTypeAliasInstantiation.types b/tests/baselines/reference/mergeSymbolReexportedTypeAliasInstantiation.types
index d3a9abf94ab..1f50660ed7e 100644
--- a/tests/baselines/reference/mergeSymbolReexportedTypeAliasInstantiation.types
+++ b/tests/baselines/reference/mergeSymbolReexportedTypeAliasInstantiation.types
@@ -26,8 +26,8 @@ const y : C = { s: '' }
 >          : ^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 === ./a.d.ts ===
 import '.'
diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types
index 722ddb913dc..84cc31991cc 100644
--- a/tests/baselines/reference/mergedDeclarations1.types
+++ b/tests/baselines/reference/mergedDeclarations1.types
@@ -41,10 +41,10 @@ module point {
 >            : ^^^^^
 >point : typeof point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
     export function equals(p1: Point, p2: Point) {
 >equals : (p1: Point, p2: Point) => boolean
@@ -94,10 +94,10 @@ var p1 = point(0, 0);
 >            : ^^^^^
 >point : typeof point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 var p2 = point.origin;
 >p2 : Point
diff --git a/tests/baselines/reference/mergedInstantiationAssignment.types b/tests/baselines/reference/mergedInstantiationAssignment.types
index 0bdd0d34264..b5fa58d61fe 100644
--- a/tests/baselines/reference/mergedInstantiationAssignment.types
+++ b/tests/baselines/reference/mergedInstantiationAssignment.types
@@ -31,16 +31,16 @@ const v1 = new GenericObject() as GenericObject &
 >  : ^^^^^^^^^^^^^^^^^^
 
 v1.x = 432;
->v1.x = 432 : number
->           : ^^^^^^
+>v1.x = 432 : 432
+>           : ^^^
 >v1.x : number
 >     : ^^^^^^
 >v1 : GenericObject<number> & ({ a?: string; } | { b?: number; })
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^      ^^^^
 >x : number
 >  : ^^^^^^
->432 : number
->    : ^^^^^^
+>432 : 432
+>    : ^^^
 
 class GenericObjectWithoutSetter<T = number> {
 >GenericObjectWithoutSetter : GenericObjectWithoutSetter<T>
@@ -68,16 +68,16 @@ const v2 = new GenericObjectWithoutSetter() as GenericObjectWithoutSetter &
 >  : ^^^^^^^^^^^^^^^^^^
 
 v2.x = 42;
->v2.x = 42 : number
->          : ^^^^^^
+>v2.x = 42 : 42
+>          : ^^
 >v2.x : number
 >     : ^^^^^^
 >v2 : GenericObjectWithoutSetter<number> & ({ a?: string; } | { b?: number; })
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^      ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 class NormalObject {
 >NormalObject : NormalObject
@@ -107,14 +107,14 @@ const v3 = new NormalObject() as NormalObject &
 >  : ^^^^^^^^^^^^^^^^^^
 
 v3.x = 42;
->v3.x = 42 : number
->          : ^^^^^^
+>v3.x = 42 : 42
+>          : ^^
 >v3.x : number
 >     : ^^^^^^
 >v3 : NormalObject & ({ a?: string; } | { b?: number; })
 >   : ^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^      ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/methodChainError.types b/tests/baselines/reference/methodChainError.types
index f700b953ce4..6dbe0a61262 100644
--- a/tests/baselines/reference/methodChainError.types
+++ b/tests/baselines/reference/methodChainError.types
@@ -42,8 +42,8 @@ new Builder()
     .method("a")
 >method : (param: string) => Builder
 >       : ^     ^^      ^^^^^       
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
     .method()
 >method : (param: string) => Builder
@@ -52,8 +52,8 @@ new Builder()
     .method("a");
 >method : (param: string) => Builder
 >       : ^     ^^      ^^^^^       
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
     
 new Builder()
@@ -77,8 +77,8 @@ new Builder()
     .method("a")
 >method : (param: string) => Builder
 >       : ^     ^^      ^^^^^       
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
     .notMethod()
 >notMethod : string
diff --git a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types
index 78aedb8ae04..b9b42cc5fc9 100644
--- a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types
+++ b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types
@@ -59,10 +59,10 @@ var r0 = map([1, ""], (x) => x.toString());
 >    : ^ ^^ ^^  ^^   ^^ ^^           ^^^^^^^^
 >[1, ""] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 >(x) => x.toString() : (x: string | number) => string
 >                    : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string | number
@@ -137,10 +137,10 @@ var r7 = map<number, string>([1, ""], (x) => x.toString()); // error
 >    : ^ ^^ ^^  ^^   ^^ ^^           ^^^^^^^^
 >[1, ""] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 >(x) => x.toString() : (x: number) => string
 >                    : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -163,10 +163,10 @@ var r7b = map<number>([1, ""], (x) => x.toString()); // error
 >    : ^ ^^ ^^  ^^   ^^ ^^           ^^^^^^^^
 >[1, ""] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 >(x) => x.toString() : (x: number) => string
 >                    : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/missingCloseBracketInArray.types b/tests/baselines/reference/missingCloseBracketInArray.types
index cf20fbc1e3f..82e0a8388f1 100644
--- a/tests/baselines/reference/missingCloseBracketInArray.types
+++ b/tests/baselines/reference/missingCloseBracketInArray.types
@@ -10,12 +10,12 @@ var alphas:string[] = alphas = ["1","2","3","4"
 >       : ^^^^^^^^
 >["1","2","3","4" : string[]
 >                 : ^^^^^^^^
->"1" : string
->    : ^^^^^^
->"2" : string
->    : ^^^^^^
->"3" : string
->    : ^^^^^^
->"4" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
+>"2" : "2"
+>    : ^^^
+>"3" : "3"
+>    : ^^^
+>"4" : "4"
+>    : ^^^
 
diff --git a/tests/baselines/reference/mixinClassesAnnotated.types b/tests/baselines/reference/mixinClassesAnnotated.types
index 71fe5cc9118..799d3eb27f0 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.types
+++ b/tests/baselines/reference/mixinClassesAnnotated.types
@@ -69,8 +69,8 @@ const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Prin
         static message = "hello";
 >message : string
 >        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         print() {
 >print : () => void
@@ -136,16 +136,16 @@ function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> &
 >     : ^^^^^
 
             this._tag = "hello";
->this._tag = "hello" : string
->                    : ^^^^^^
+>this._tag = "hello" : "hello"
+>                    : ^^^^^^^
 >this._tag : string
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >_tag : string
 >     : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
     return C;
@@ -196,12 +196,12 @@ function f1() {
 >                    : ^^^^^^^^^^^^^^^^
 >Thing1 : Constructor<Tagged> & typeof Derived
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     thing.x;
 >thing.x : number
@@ -231,12 +231,12 @@ function f2() {
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Thing2 : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     thing.x;
 >thing.x : number
@@ -280,12 +280,12 @@ class Thing3 extends Thing2 {
 >                  : ^^^^
 >super : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
->30 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
+>30 : 30
+>   : ^^
 
         this._tag = tag;
 >this._tag = tag : string
diff --git a/tests/baselines/reference/mixinClassesAnonymous.types b/tests/baselines/reference/mixinClassesAnonymous.types
index fd76f0f899d..49df926846c 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.types
+++ b/tests/baselines/reference/mixinClassesAnonymous.types
@@ -120,16 +120,16 @@ function Tagged<T extends Constructor<{}>>(superClass: T) {
 >     : ^^^^^
 
             this._tag = "hello";
->this._tag = "hello" : string
->                    : ^^^^^^
+>this._tag = "hello" : "hello"
+>                    : ^^^^^^^
 >this._tag : string
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >_tag : string
 >     : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
         }
     }
     return C;
@@ -180,12 +180,12 @@ function f1() {
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Thing1 : { new (...args: any[]): Tagged<typeof Derived>.C; prototype: Tagged<any>.C; } & typeof Derived
 >       : ^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     thing.x;
 >thing.x : number
@@ -215,12 +215,12 @@ function f2() {
 >                    : ^^^^^^^^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Thing2 : { new (...args: any[]): Tagged<{ new (...args: any[]): Printable<typeof Derived>.(Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): Printable<typeof Derived>.(Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & typeof Derived
 >       : ^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     thing.x;
 >thing.x : number
@@ -264,12 +264,12 @@ class Thing3 extends Thing2 {
 >                  : ^^^^
 >super : { new (...args: any[]): Tagged<{ new (...args: any[]): Printable<typeof Derived>.(Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): Printable<typeof Derived>.(Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & typeof Derived
 >      : ^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
->30 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
+>30 : 30
+>   : ^^
 
         this._tag = tag;
 >this._tag = tag : string
diff --git a/tests/baselines/reference/mixinClassesMembers.types b/tests/baselines/reference/mixinClassesMembers.types
index 4c8f28e72fc..8e8019df741 100644
--- a/tests/baselines/reference/mixinClassesMembers.types
+++ b/tests/baselines/reference/mixinClassesMembers.types
@@ -115,8 +115,8 @@ function f1() {
 >                    : ^^^^^^^
 >Mixed1 : typeof M1 & typeof C1
 >       : ^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x2 = new Mixed1(42);
 >x2 : M1 & C1
@@ -125,8 +125,8 @@ function f1() {
 >               : ^^^^^^^
 >Mixed1 : typeof M1 & typeof C1
 >       : ^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     let x3 = new Mixed2("hello");
 >x3 : C1 & M1
@@ -135,8 +135,8 @@ function f1() {
 >                    : ^^^^^^^
 >Mixed2 : typeof C1 & typeof M1
 >       : ^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x4 = new Mixed2(42);
 >x4 : C1 & M1
@@ -145,8 +145,8 @@ function f1() {
 >               : ^^^^^^^
 >Mixed2 : typeof C1 & typeof M1
 >       : ^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     let x5 = new Mixed3("hello");
 >x5 : M2 & M1 & C1
@@ -155,8 +155,8 @@ function f1() {
 >                    : ^^^^^^^^^^^^
 >Mixed3 : typeof M2 & typeof M1 & typeof C1
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x6 = new Mixed3(42);
 >x6 : M2 & M1 & C1
@@ -165,8 +165,8 @@ function f1() {
 >               : ^^^^^^^^^^^^
 >Mixed3 : typeof M2 & typeof M1 & typeof C1
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     let x7 = new Mixed4("hello");
 >x7 : C1 & M1 & M2
@@ -175,8 +175,8 @@ function f1() {
 >                    : ^^^^^^^^^^^^
 >Mixed4 : typeof C1 & typeof M1 & typeof M2
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     let x8 = new Mixed4(42);
 >x8 : C1 & M1 & M2
@@ -185,8 +185,8 @@ function f1() {
 >               : ^^^^^^^^^^^^
 >Mixed4 : typeof C1 & typeof M1 & typeof M2
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     let x9 = new Mixed5();
 >x9 : M1 & M2
@@ -208,8 +208,8 @@ function f2() {
 >                    : ^^^^^^^
 >Mixed1 : typeof M1 & typeof C1
 >       : ^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x.a;
 >x.a : number
@@ -247,8 +247,8 @@ function f3() {
 >                    : ^^^^^^^
 >Mixed2 : typeof C1 & typeof M1
 >       : ^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x.a;
 >x.a : number
@@ -286,8 +286,8 @@ function f4() {
 >                    : ^^^^^^^^^^^^
 >Mixed3 : typeof M2 & typeof M1 & typeof C1
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x.a;
 >x.a : number
@@ -345,8 +345,8 @@ function f5() {
 >                    : ^^^^^^^^^^^^
 >Mixed4 : typeof C1 & typeof M1 & typeof M2
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x.a;
 >x.a : number
@@ -454,8 +454,8 @@ class C2 extends Mixed1 {
 >               : ^^^^
 >super : typeof M1 & typeof C1
 >      : ^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         this.a;
 >this.a : number
@@ -495,8 +495,8 @@ class C3 extends Mixed3 {
 >          : ^^^^
 >super : typeof M2 & typeof M1 & typeof C1
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         this.a;
 >this.a : number
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.types b/tests/baselines/reference/mixinPrivateAndProtected.types
index 2b3c4fdba74..e0948d6a56c 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.types
+++ b/tests/baselines/reference/mixinPrivateAndProtected.types
@@ -16,20 +16,20 @@ class A {
     public pb: number = 2;
 >pb : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     protected ptd: number = 1;
 >ptd : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     private pvt: number = 0;
 >pvt : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function mixB<T extends Constructor<{}>>(Cls: T) {
@@ -47,14 +47,14 @@ function mixB<T extends Constructor<{}>>(Cls: T) {
         protected ptd: number = 10;
 >ptd : number
 >    : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         private pvt: number = 0;
 >pvt : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     };
 }
@@ -74,8 +74,8 @@ function mixB2<T extends Constructor<A>>(Cls: T) {
         protected ptd: number = 10;
 >ptd : number
 >    : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     };
 }
@@ -116,14 +116,14 @@ function mixC<T extends Constructor<{}>>(Cls: T) {
         protected ptd: number = 100;
 >ptd : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
         private pvt: number = 0;
 >pvt : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     };
 }
diff --git a/tests/baselines/reference/mixingApparentTypeOverrides.types b/tests/baselines/reference/mixingApparentTypeOverrides.types
index 0c86a819ee8..7faccb888fd 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.types
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.types
@@ -37,16 +37,16 @@ function Tagged<T extends Constructor<{}>>(Base: T) {
 >     : ^^^^^
 
       this._tag = "";
->this._tag = "" : string
->               : ^^^^^^
+>this._tag = "" : ""
+>               : ^^
 >this._tag : string
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >_tag : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
   };
 }
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.types b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.types
index 69d84935700..106548afd59 100644
--- a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.types
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.types
@@ -30,10 +30,10 @@ f(1, 2, 3);
 >           : ^^^
 >f : (x: number, y: number, z: number) => any
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types
index 8cf1fb8e2c2..7294263ded5 100644
--- a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types
@@ -31,12 +31,12 @@ f(1, 2, 3);  // no error
 >           : ^^^
 >f : (x: number, y: number, z: number) => any
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 // Using ES6 collection
 var m = new Map<string, number>();
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.types b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.types
index 5aef76b70d7..dc9159eb95e 100644
--- a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.types
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.types
@@ -29,12 +29,12 @@ f(1, 2, 3);   // no error
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 let a = ['c', 'd'];
 >a : string[]
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
index 41866bd7bc8..79250a582cd 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
@@ -30,12 +30,12 @@ f(1, 2, 3);  // no error
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 // Using ES6 collection
 var m = new Map<string, number>();
@@ -153,8 +153,8 @@ Math.sign(1);
 >     : ^^^^
 >sign : (x: number) => number
 >     : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Using ES6 object
 var o = {
@@ -315,10 +315,10 @@ str.includes("hello", 0);
 >    : ^^^^^^
 >includes : (searchString: string, position?: number) => boolean
 >         : ^            ^^      ^^        ^^^      ^^^^^       
->"hello" : string
->        : ^^^^^^
->0 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>0 : 0
+>  : ^
 
 // Using ES6 symbol
 var s = Symbol();
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
index a8caae1cc81..55d4b9bcb32 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
@@ -30,12 +30,12 @@ f(1, 2, 3);  // no error
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 // Using ES6 collection
 var m = new Map<string, number>();
@@ -153,8 +153,8 @@ Math.sign(1);
 >     : ^^^^
 >sign : (x: number) => number
 >     : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Using ES6 object
 var o = {
@@ -315,10 +315,10 @@ str.includes("hello", 0);
 >    : ^^^^^^
 >includes : (searchString: string, position?: number) => boolean
 >         : ^            ^^      ^^        ^^^      ^^^^^       
->"hello" : string
->        : ^^^^^^
->0 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>0 : 0
+>  : ^
 
 // Using ES6 symbol
 var s = Symbol();
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
index bf61778fc7b..a8e7094e159 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
@@ -30,12 +30,12 @@ f(1, 2, 3);  // no error
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 // Using ES6 collection
 var m = new Map<string, number>();
@@ -153,8 +153,8 @@ Math.sign(1);
 >     : ^^^^
 >sign : (x: number) => number
 >     : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Using ES6 object
 var o = {
@@ -315,10 +315,10 @@ str.includes("hello", 0);
 >    : ^^^^^^
 >includes : (searchString: string, position?: number) => boolean
 >         : ^            ^^      ^^        ^^^      ^^^^^       
->"hello" : string
->        : ^^^^^^
->0 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>0 : 0
+>  : ^
 
 // Using ES6 symbol
 var s = Symbol();
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
index ba3a52e4018..cb5bfa219fe 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
@@ -30,12 +30,12 @@ f(1, 2, 3);  // no error
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 // Using ES6 collection
 var m = new Map<string, number>();
@@ -90,8 +90,8 @@ Math.sign(1);
 >     : ^^^^
 >sign : (x: number) => number
 >     : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Using ES6 object
 var o = {
@@ -205,10 +205,10 @@ str.includes("hello", 0);
 >    : ^^^^^^
 >includes : (searchString: string, position?: number) => boolean
 >         : ^            ^^      ^^        ^^^      ^^^^^       
->"hello" : string
->        : ^^^^^^
->0 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>0 : 0
+>  : ^
 
 // Using ES6 symbol
 var s = Symbol();
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types
index 818f19b9792..1925491a338 100644
--- a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types
@@ -30,10 +30,10 @@ f(1, 2, 3);
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types
index d1af1a41b63..a59aefad56b 100644
--- a/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types
@@ -29,12 +29,12 @@ f(1, 2, 3);   // no error
 >           : ^^^^^
 >f : (x: number, y: number, z: number) => any[]
 >  : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 let a = ['c', 'd'];
 >a : string[]
diff --git a/tests/baselines/reference/moduleCodeGenTest3.types b/tests/baselines/reference/moduleCodeGenTest3.types
index 8abd83be154..b0aa027280a 100644
--- a/tests/baselines/reference/moduleCodeGenTest3.types
+++ b/tests/baselines/reference/moduleCodeGenTest3.types
@@ -10,14 +10,14 @@ module Baz { export var x = "hello"; }
 >        : ^^^^^^^
 
 Baz.x = "goodbye";
->Baz.x = "goodbye" : string
->                  : ^^^^^^
+>Baz.x = "goodbye" : "goodbye"
+>                  : ^^^^^^^^^
 >Baz.x : string
 >      : ^^^^^^
 >Baz : typeof Baz
 >    : ^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"goodbye" : string
->          : ^^^^^^
+>"goodbye" : "goodbye"
+>          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/moduleCodegenTest4.types b/tests/baselines/reference/moduleCodegenTest4.types
index 22a399bf1d6..afe8768e10d 100644
--- a/tests/baselines/reference/moduleCodegenTest4.types
+++ b/tests/baselines/reference/moduleCodegenTest4.types
@@ -10,16 +10,16 @@ export module Baz { export var x = "hello"; }
 >        : ^^^^^^^
 
 Baz.x = "goodbye";
->Baz.x = "goodbye" : string
->                  : ^^^^^^
+>Baz.x = "goodbye" : "goodbye"
+>                  : ^^^^^^^^^
 >Baz.x : string
 >      : ^^^^^^
 >Baz : typeof Baz
 >    : ^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"goodbye" : string
->          : ^^^^^^
+>"goodbye" : "goodbye"
+>          : ^^^^^^^^^
 
 void 0;
 >void 0 : undefined
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.types b/tests/baselines/reference/moduleDuplicateIdentifiers.types
index 27cbf903fa8..bf218b71401 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.types
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.types
@@ -76,12 +76,12 @@ export var Pot = 2;
 >  : ^
 
 Pot = 42; // Shouldn't error
->Pot = 42 : number
->         : ^^^^^^
+>Pot = 42 : 42
+>         : ^^
 >Pot : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 export enum Utensils {
 >Utensils : Utensils
diff --git a/tests/baselines/reference/moduleExportAlias2.types b/tests/baselines/reference/moduleExportAlias2.types
index c96913cc30d..dd5e94f933f 100644
--- a/tests/baselines/reference/moduleExportAlias2.types
+++ b/tests/baselines/reference/moduleExportAlias2.types
@@ -9,8 +9,8 @@ const C = require("./semver")
 >                    : ^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->"./semver" : string
->           : ^^^^^^
+>"./semver" : "./semver"
+>           : ^^^^^^^^^^
 
 var two = C.f(1)
 >two : any
diff --git a/tests/baselines/reference/moduleExportAliasImported.types b/tests/baselines/reference/moduleExportAliasImported.types
index 79922397017..d6a765c7555 100644
--- a/tests/baselines/reference/moduleExportAliasImported.types
+++ b/tests/baselines/reference/moduleExportAliasImported.types
@@ -33,6 +33,6 @@ module.exports = alias
 import('./bug28014')
 >import('./bug28014') : Promise<{ (): void; version: 1; }>
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'./bug28014' : string
->             : ^^^^^^
+>'./bug28014' : "./bug28014"
+>             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/moduleExportAssignment.types b/tests/baselines/reference/moduleExportAssignment.types
index 587fc59f07b..1210eea2416 100644
--- a/tests/baselines/reference/moduleExportAssignment.types
+++ b/tests/baselines/reference/moduleExportAssignment.types
@@ -63,8 +63,8 @@ npmlog.on('hi') // both references should see EE.on
 >       : ^^^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >on : (s: string) => void
 >   : ^ ^^      ^^^^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
 module.exports.on('hi') // here too
 >module.exports.on('hi') : void
@@ -79,8 +79,8 @@ module.exports.on('hi') // here too
 >        : ^^^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >on : (s: string) => void
 >   : ^ ^^      ^^^^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
 npmlog.x = 1
 >npmlog.x = 1 : 1
diff --git a/tests/baselines/reference/moduleExportAssignment6.types b/tests/baselines/reference/moduleExportAssignment6.types
index 7ee7e7d5c1a..577e7deb222 100644
--- a/tests/baselines/reference/moduleExportAssignment6.types
+++ b/tests/baselines/reference/moduleExportAssignment6.types
@@ -65,8 +65,8 @@ function exec() {
 >          : ^
 >C : typeof C
 >  : ^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     return module.exports; // should be fine because `module` is defined locally
 >module.exports : number[]
@@ -89,8 +89,8 @@ function tricky() {
 >          : ^
 >C : typeof C
 >  : ^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     return () => {
 >() => {        return module.exports;    } : () => number[]
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types
index 3c07cec21a6..32f4fb47ed4 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types
@@ -9,8 +9,8 @@ var mod1 = require('./mod1')
 >                  : ^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->'./mod1' : string
->         : ^^^^^^
+>'./mod1' : "./mod1"
+>         : ^^^^^^^^
 
 mod1()
 >mod1() : void
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types
index 717e96cc710..6f4240b90ac 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types
@@ -9,8 +9,8 @@ var mod1 = require('./mod1')
 >                  : ^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->'./mod1' : string
->         : ^^^^^^
+>'./mod1' : "./mod1"
+>         : ^^^^^^^^
 
 mod1.toFixed(12)
 >mod1.toFixed(12) : string
@@ -21,8 +21,8 @@ mod1.toFixed(12)
 >     : ^^^^^^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 mod1.f() // error, 'f' is not a property on 'number'
 >mod1.f() : any
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types
index 2f8a8b18af5..55a40ca5d53 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types
@@ -9,8 +9,8 @@ var mod1 = require('./mod1')
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->'./mod1' : string
->         : ^^^^^^
+>'./mod1' : "./mod1"
+>         : ^^^^^^^^
 
 mod1.justExport.toFixed()
 >mod1.justExport.toFixed() : string
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types
index 2322c3aa828..39d434f9f0e 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types
@@ -9,8 +9,8 @@ var mod1 = require('./mod1')
 >                  : ^^^^^^^^^^^
 >require : (name: string) => any
 >        : ^    ^^      ^^^^^   
->'./mod1' : string
->         : ^^^^^^
+>'./mod1' : "./mod1"
+>         : ^^^^^^^^
 
 mod1.justExport.toFixed()
 >mod1.justExport.toFixed() : string
diff --git a/tests/baselines/reference/moduleExports1.types b/tests/baselines/reference/moduleExports1.types
index e6ecead8169..6aeb420d7ee 100644
--- a/tests/baselines/reference/moduleExports1.types
+++ b/tests/baselines/reference/moduleExports1.types
@@ -40,16 +40,16 @@ var rue = new TypeScript.Strasse.Street.Rue();
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 rue.address = "1 Main Street";
->rue.address = "1 Main Street" : string
->                              : ^^^^^^
+>rue.address = "1 Main Street" : "1 Main Street"
+>                              : ^^^^^^^^^^^^^^^
 >rue.address : string
 >            : ^^^^^^
 >rue : TypeScript.Strasse.Street.Rue
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >address : string
 >        : ^^^^^^
->"1 Main Street" : string
->                : ^^^^^^
+>"1 Main Street" : "1 Main Street"
+>                : ^^^^^^^^^^^^^^^
 
 void 0;
 >void 0 : undefined
diff --git a/tests/baselines/reference/moduleMerge.types b/tests/baselines/reference/moduleMerge.types
index 2e7555fc3b6..8e746a04b5e 100644
--- a/tests/baselines/reference/moduleMerge.types
+++ b/tests/baselines/reference/moduleMerge.types
@@ -16,8 +16,8 @@ module A
 >      : ^^^^^^      
         {
             return "from private B";
->"from private B" : string
->                 : ^^^^^^
+>"from private B" : "from private B"
+>                 : ^^^^^^^^^^^^^^^^
         }
     }
 }
@@ -35,8 +35,8 @@ module A
 >      : ^^^^^^      
         {
             return "from export B";
->"from export B" : string
->                : ^^^^^^
+>"from export B" : "from export B"
+>                : ^^^^^^^^^^^^^^^
         }
     }
 }
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).types b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).types
index 1ee509edcfa..076b6dc9ed1 100644
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).types
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).types
@@ -6,8 +6,8 @@ const foo = import("./b");
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./b") : Promise<typeof import("/b")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./b" : string
->      : ^^^^^^
+>"./b" : "./b"
+>      : ^^^^^
 
 === /b.js ===
 
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).types b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).types
index 1ee509edcfa..076b6dc9ed1 100644
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).types
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).types
@@ -6,8 +6,8 @@ const foo = import("./b");
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./b") : Promise<typeof import("/b")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./b" : string
->      : ^^^^^^
+>"./b" : "./b"
+>      : ^^^^^
 
 === /b.js ===
 
diff --git a/tests/baselines/reference/modulePreserve4.types b/tests/baselines/reference/modulePreserve4.types
index e2382ebbf73..6d00a2d954e 100644
--- a/tests/baselines/reference/modulePreserve4.types
+++ b/tests/baselines/reference/modulePreserve4.types
@@ -94,8 +94,8 @@ const a3 = await import("./a"); // { x: 0 }
 >                    : ^^^^^^^^^
 >import("./a") : Promise<typeof a1>
 >              : ^^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 
 a3.x;
 >a3.x : 0
@@ -128,8 +128,8 @@ const b3 = await import("./b"); // { default: 0 }
 >                    : ^^^^^^^^^
 >import("./b") : Promise<typeof b2>
 >              : ^^^^^^^^^^^^^^^^^^
->"./b" : string
->      : ^^^^^^
+>"./b" : "./b"
+>      : ^^^^^
 
 b3.default;
 >b3.default : 0
@@ -186,8 +186,8 @@ const d3 = await import("./d"); // { default: [Function: default] }
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./d") : Promise<{ default: () => void; }>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./d" : string
->      : ^^^^^^
+>"./d" : "./d"
+>      : ^^^^^
 
 d3.default();
 >d3.default() : void
diff --git a/tests/baselines/reference/moduleResolutionWithoutExtension5.types b/tests/baselines/reference/moduleResolutionWithoutExtension5.types
index 6114223a3eb..50d45cebb23 100644
--- a/tests/baselines/reference/moduleResolutionWithoutExtension5.types
+++ b/tests/baselines/reference/moduleResolutionWithoutExtension5.types
@@ -9,8 +9,8 @@ import("./foo").then(x => x); // should error, ask for extension
 >                     : ^        ^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<any>
 >                : ^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >then : <TResult1 = any, TResult2 = never>(onfulfilled?: (value: any) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >     : ^        ^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x => x : (x: any) => any
diff --git a/tests/baselines/reference/moduleResolutionWithoutExtension8.types b/tests/baselines/reference/moduleResolutionWithoutExtension8.types
index f8c40460d31..7e633287758 100644
--- a/tests/baselines/reference/moduleResolutionWithoutExtension8.types
+++ b/tests/baselines/reference/moduleResolutionWithoutExtension8.types
@@ -9,8 +9,8 @@ import("./foo").then(x => x); // should error, ask for extension
 >                     : ^        ^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./foo") : Promise<any>
 >                : ^^^^^^^^^^^^
->"./foo" : string
->        : ^^^^^^
+>"./foo" : "./foo"
+>        : ^^^^^^^
 >then : <TResult1 = any, TResult2 = never>(onfulfilled?: (value: any) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >     : ^        ^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x => x : (x: any) => any
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index 451ef56d91d..60e0307c3ad 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -71,8 +71,8 @@ module A {
 >  : ^^^^^^
 
         return 2;
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
     var array: I[] = null;
 >array : I[]
@@ -192,8 +192,8 @@ module Y {
 >  : ^^^^^^
 
         return 2;
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
     export var array: I[] = null;
 >array : I[]
diff --git a/tests/baselines/reference/multiExtendsSplitInterfaces1.types b/tests/baselines/reference/multiExtendsSplitInterfaces1.types
index c5687b11a05..bafa418ced5 100644
--- a/tests/baselines/reference/multiExtendsSplitInterfaces1.types
+++ b/tests/baselines/reference/multiExtendsSplitInterfaces1.types
@@ -10,6 +10,6 @@ self.cancelAnimationFrame(0);
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cancelAnimationFrame : ((handle: number) => void) & ((handle: number) => void)
 >                     : ^^      ^^      ^^^^^    ^^^^^^      ^^      ^^^^^    ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/multiModuleFundule1.types b/tests/baselines/reference/multiModuleFundule1.types
index 89b6367179e..0b5b16a5a21 100644
--- a/tests/baselines/reference/multiModuleFundule1.types
+++ b/tests/baselines/reference/multiModuleFundule1.types
@@ -33,16 +33,16 @@ var r = C(2);
 >     : ^^^^
 >C : typeof C
 >  : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var r2 = new C(2); // using void returning function as constructor
 >r2 : any
 >new C(2) : any
 >C : typeof C
 >  : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var r3 = C.foo();
 >r3 : void
diff --git a/tests/baselines/reference/multiline.types b/tests/baselines/reference/multiline.types
index 66886f0d42a..79ec14021b4 100644
--- a/tests/baselines/reference/multiline.types
+++ b/tests/baselines/reference/multiline.types
@@ -22,8 +22,8 @@ texts.push(100);
 >      : ^^^^^^^^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 /**
  @ts-expect-error */
@@ -36,8 +36,8 @@ texts.push(100);
 >      : ^^^^^^^^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 /**
  @ts-expect-error */
@@ -50,8 +50,8 @@ texts.push("100");
 >      : ^^^^^^^^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->"100" : string
->      : ^^^^^^
+>"100" : "100"
+>      : ^^^^^
 
 === b.tsx ===
 import * as React from "react";
@@ -94,8 +94,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     {/*@ts-ignore*/}
     <MyComponent foo={100} />
@@ -105,8 +105,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     {/*
    @ts-expect-error */}
@@ -117,8 +117,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     {/*
    // @ts-expect-error */}
@@ -129,8 +129,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     {/*
    * @ts-expect-error */}
@@ -141,8 +141,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     {/*@ts-expect-error*/}
     <MyComponent foo={100} />
@@ -152,8 +152,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
     {/*
    @ts-expect-error */}
@@ -164,8 +164,8 @@ let x = (
 >            : ^     ^^                ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->"hooray" : string
->         : ^^^^^^
+>"hooray" : "hooray"
+>         : ^^^^^^^^
 
   </div>
 >div : any
diff --git a/tests/baselines/reference/multipleInferenceContexts.types b/tests/baselines/reference/multipleInferenceContexts.types
index b9504ab9369..a5ec569ebd7 100644
--- a/tests/baselines/reference/multipleInferenceContexts.types
+++ b/tests/baselines/reference/multipleInferenceContexts.types
@@ -53,8 +53,8 @@ const r2 = Moon({
 >            : ^^^^^^^^^^^^^^^^
 >msg : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     render() {
 >render : () => unknown
diff --git a/tests/baselines/reference/multipleInheritance.types b/tests/baselines/reference/multipleInheritance.types
index 2637dd060d2..cf138aff09a 100644
--- a/tests/baselines/reference/multipleInheritance.types
+++ b/tests/baselines/reference/multipleInheritance.types
@@ -80,8 +80,8 @@ class Good {
 >  : ^^^^^^      
 >function() { return 0; } : () => number
 >                         : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public g() { return 0; }
 >g : () => number
@@ -99,8 +99,8 @@ class Baad extends Good {
     public f(): number { return 0; }
 >f : () => number
 >  : ^^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public g(n:number) { return 0; }
 >g : (n: number) => number
diff --git a/tests/baselines/reference/multipleNumericIndexers.types b/tests/baselines/reference/multipleNumericIndexers.types
index c123d0eb3d7..aa7adc6ed6e 100644
--- a/tests/baselines/reference/multipleNumericIndexers.types
+++ b/tests/baselines/reference/multipleNumericIndexers.types
@@ -56,12 +56,12 @@ var b: {
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >1 : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >"2" : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 class C2<T> {
 >C2 : C2<T>
diff --git a/tests/baselines/reference/multipleStringIndexers.types b/tests/baselines/reference/multipleStringIndexers.types
index 27b0e874bec..fb7ae1863c5 100644
--- a/tests/baselines/reference/multipleStringIndexers.types
+++ b/tests/baselines/reference/multipleStringIndexers.types
@@ -56,8 +56,8 @@ var b: {
 >          : ^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 class C2<T> {
 >C2 : C2<T>
diff --git a/tests/baselines/reference/multivar.types b/tests/baselines/reference/multivar.types
index 8baf7aa123c..c4b66a709fe 100644
--- a/tests/baselines/reference/multivar.types
+++ b/tests/baselines/reference/multivar.types
@@ -32,8 +32,8 @@ module m2 {
 >  : ^^^
 >b2 : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : any
 >  : ^^^
 
@@ -46,8 +46,8 @@ module m2 {
 >   : ^^^
 >b22 : number
 >    : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b222 : any
 >     : ^^^
 
diff --git a/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types b/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types
index ff099c83f8f..dff31c93633 100644
--- a/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types
+++ b/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types
@@ -34,8 +34,8 @@ namespace Lib { // should fail to merge
     export const foo: string = "";
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 Lib.foo; // should work
 >Lib.foo : string
diff --git a/tests/baselines/reference/narrowByBooleanComparison.types b/tests/baselines/reference/narrowByBooleanComparison.types
index 94e92b3f092..cbfe5818cfd 100644
--- a/tests/baselines/reference/narrowByBooleanComparison.types
+++ b/tests/baselines/reference/narrowByBooleanComparison.types
@@ -248,8 +248,8 @@ function test3(foo: unknown) {
 >                                      : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Not a string or an array' : string
->                           : ^^^^^^
+>'Not a string or an array' : "Not a string or an array"
+>                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
     foo;
 >foo : string | any[]
diff --git a/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue7.types b/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue7.types
index aa777102da9..029915c46a2 100644
--- a/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue7.types
+++ b/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue7.types
@@ -8,8 +8,8 @@ class Base {
     basey: string = "";
 >basey : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class Derived1 extends Base {
@@ -21,8 +21,8 @@ class Derived1 extends Base {
     d: string = "";
 >d : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class Derived2 extends Base {
@@ -34,14 +34,14 @@ class Derived2 extends Base {
     d: string = "";
 >d : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     other: string = "";
 >other : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function classy(base: Base, someDerived: Derived1 | Derived2) {
diff --git a/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue9.types b/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue9.types
index 928baebd481..12a2ccc01c3 100644
--- a/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue9.types
+++ b/tests/baselines/reference/narrowByClauseExpressionInSwitchTrue9.types
@@ -14,8 +14,8 @@ class Foo {
     mine: string = "";
 >mine : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     myMethod(x: IProps) {
 >myMethod : (x: IProps) => void
diff --git a/tests/baselines/reference/narrowByEquality.types b/tests/baselines/reference/narrowByEquality.types
index 7cbba535315..ac865f47a57 100644
--- a/tests/baselines/reference/narrowByEquality.types
+++ b/tests/baselines/reference/narrowByEquality.types
@@ -188,8 +188,8 @@ function test(level: number | string):number {
 >      : ^^^^^^^^^^^^^^^
     }
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 // From issue #32798
diff --git a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=false).types b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=false).types
index b97f2ad08f4..1dabaad4c16 100644
--- a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=false).types
+++ b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=false).types
@@ -118,7 +118,7 @@ function assertUnreachable(_: never): never {
 >                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unreachable path taken" : string
->                         : ^^^^^^
+>"Unreachable path taken" : "Unreachable path taken"
+>                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=true).types b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=true).types
index c82e4dc5a22..2e59df67203 100644
--- a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=true).types
+++ b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=false,nouncheckedindexedaccess=true).types
@@ -118,7 +118,7 @@ function assertUnreachable(_: never): never {
 >                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unreachable path taken" : string
->                         : ^^^^^^
+>"Unreachable path taken" : "Unreachable path taken"
+>                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=false).types b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=false).types
index b97f2ad08f4..1dabaad4c16 100644
--- a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=false).types
+++ b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=false).types
@@ -118,7 +118,7 @@ function assertUnreachable(_: never): never {
 >                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unreachable path taken" : string
->                         : ^^^^^^
+>"Unreachable path taken" : "Unreachable path taken"
+>                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=true).types b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=true).types
index c82e4dc5a22..2e59df67203 100644
--- a/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=true).types
+++ b/tests/baselines/reference/narrowBySwitchDiscriminantUndefinedCase1(exactoptionalpropertytypes=true,nouncheckedindexedaccess=true).types
@@ -118,7 +118,7 @@ function assertUnreachable(_: never): never {
 >                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unreachable path taken" : string
->                         : ^^^^^^
+>"Unreachable path taken" : "Unreachable path taken"
+>                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/narrowingAssignmentReadonlyRespectsAssertion.types b/tests/baselines/reference/narrowingAssignmentReadonlyRespectsAssertion.types
index cee43c540c2..43415e124c6 100644
--- a/tests/baselines/reference/narrowingAssignmentReadonlyRespectsAssertion.types
+++ b/tests/baselines/reference/narrowingAssignmentReadonlyRespectsAssertion.types
@@ -38,12 +38,12 @@ function subDataFunc(): TestCase<string | number>[] {
 >     : ^^^^^^^^
 >["a", "b", "c"] : string[]
 >                : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
 
       { val1: 2, val2: [1, 2, 3] },
 >{ val1: 2, val2: [1, 2, 3] } : { val1: number; val2: number[]; }
@@ -56,12 +56,12 @@ function subDataFunc(): TestCase<string | number>[] {
 >     : ^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
       { val1: ["a", "z"], val2: ["x", "y", "z"] },
 >{ val1: ["a", "z"], val2: ["x", "y", "z"] } : { val1: string[]; val2: string[]; }
@@ -70,20 +70,20 @@ function subDataFunc(): TestCase<string | number>[] {
 >     : ^^^^^^^^
 >["a", "z"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"z" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"z" : "z"
+>    : ^^^
 >val2 : string[]
 >     : ^^^^^^^^
 >["x", "y", "z"] : string[]
 >                : ^^^^^^^^
->"x" : string
->    : ^^^^^^
->"y" : string
->    : ^^^^^^
->"z" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
+>"y" : "y"
+>    : ^^^
+>"z" : "z"
+>    : ^^^
 
       { val1: [5, 10], val2: [10, 100, 1000] },
 >{ val1: [5, 10], val2: [10, 100, 1000] } : { val1: number[]; val2: number[]; }
@@ -92,20 +92,20 @@ function subDataFunc(): TestCase<string | number>[] {
 >     : ^^^^^^^^
 >[5, 10] : number[]
 >        : ^^^^^^^^
->5 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>5 : 5
+>  : ^
+>10 : 10
+>   : ^^
 >val2 : number[]
 >     : ^^^^^^^^
 >[10, 100, 1000] : number[]
 >                : ^^^^^^^^
->10 : number
->   : ^^^^^^
->100 : number
->    : ^^^^^^
->1000 : number
->     : ^^^^^^
+>10 : 10
+>   : ^^
+>100 : 100
+>    : ^^^
+>1000 : 1000
+>     : ^^^^
 
   ];
 }
diff --git a/tests/baselines/reference/narrowingByTypeofInSwitch.types b/tests/baselines/reference/narrowingByTypeofInSwitch.types
index 1074f732292..ef91b62d22a 100644
--- a/tests/baselines/reference/narrowingByTypeofInSwitch.types
+++ b/tests/baselines/reference/narrowingByTypeofInSwitch.types
@@ -700,8 +700,8 @@ function exhaustiveChecks(x: number | string | L | R): string {
 >  : ^^^^^^
 >toString : (radix?: number) => string
 >         : ^     ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         case 'string': return x;
 >'string' : "string"
@@ -716,8 +716,8 @@ function exhaustiveChecks(x: number | string | L | R): string {
 >      : ^^^^^^
 >x : L
 >  : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         case 'object': return x.x;
 >'object' : "object"
@@ -754,8 +754,8 @@ function exhaustiveChecksGenerics<T extends L | R | number | string>(x: T): stri
 >  : ^^^^^^
 >toString : (radix?: number) => string
 >         : ^     ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         case 'string': return x;
 >'string' : "string"
@@ -774,8 +774,8 @@ function exhaustiveChecksGenerics<T extends L | R | number | string>(x: T): stri
 >       : ^
 >x : L
 >  : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         case 'object': return (x as R).x;            // Can't narrow generic
 >'object' : "object"
@@ -816,8 +816,8 @@ function multipleGeneric<X extends L, Y extends R>(xy: X | Y): [X, string] | [Y,
 >       : ^^^^^^
 >xy : X
 >   : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         case 'object': return [xy, xy.y];
 >'object' : "object"
@@ -862,8 +862,8 @@ function multipleGenericFuse<X extends L | number, Y extends R | number>(xy: X |
 >        : ^^^^^^^^^^^^^^^^^^^^^^
 >xy : X & Function
 >   : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         case 'object': return [xy, 'two'];
 >'object' : "object"
@@ -872,8 +872,8 @@ function multipleGenericFuse<X extends L | number, Y extends R | number>(xy: X |
 >            : ^^^^^^^^^^^^^^^^^^^^
 >xy : Y & object
 >   : ^^^^^^^^^^
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 
         case 'number': return [xy]
 >'number' : "number"
@@ -922,8 +922,8 @@ function multipleGenericExhaustive<X extends L, Y extends R>(xy: X | Y): [X, str
 >       : ^^^^^^
 >xy : X
 >   : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -1713,8 +1713,8 @@ function multipleGenericFuseWithBoth<X extends L | number, Y extends R | number>
 >        : ^^^^^^^^^^^^^^^^^^^^^^
 >xy : X & Function
 >   : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         case 'object': return [xy, 'two'];
 >'object' : "object"
@@ -1723,8 +1723,8 @@ function multipleGenericFuseWithBoth<X extends L | number, Y extends R | number>
 >            : ^^^^^^^^^^^^^^^^^^^^
 >xy : Y & object
 >   : ^^^^^^^^^^
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 
         case `number`: return [xy]
 >`number` : "number"
diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.types b/tests/baselines/reference/narrowingConstrainedTypeParameter.types
index a8a19c45014..04935903cbe 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeParameter.types
+++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.types
@@ -53,8 +53,8 @@ export function speak<TPet extends Pet>(pet: TPet, voice: (pet: TPet) => string)
 >                                          : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Expected \"pet\" to be a Pet" : string
->                               : ^^^^^^
+>"Expected \"pet\" to be a Pet" : "Expected \"pet\" to be a Pet"
+>                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
     return voice(pet);
 >voice(pet) : string
diff --git a/tests/baselines/reference/narrowingOfDottedNames.types b/tests/baselines/reference/narrowingOfDottedNames.types
index a2059d11b2c..ea36aa26433 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.types
+++ b/tests/baselines/reference/narrowingOfDottedNames.types
@@ -204,8 +204,8 @@ class AInfo {
     a_count: number = 1;
 >a_count : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 class BInfo {
@@ -215,8 +215,8 @@ class BInfo {
     b_count: number = 1;
 >b_count : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 class Base {
@@ -226,8 +226,8 @@ class Base {
     id: number = 0;
 >id : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class A2 extends Base {
@@ -271,8 +271,8 @@ while (target) {
 >   : ^^^^^^^^^
 
         target.info.a_count = 3;
->target.info.a_count = 3 : number
->                        : ^^^^^^
+>target.info.a_count = 3 : 3
+>                        : ^
 >target.info.a_count : number
 >                    : ^^^^^^
 >target.info : AInfo
@@ -283,8 +283,8 @@ while (target) {
 >     : ^^^^^
 >a_count : number
 >        : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
     else if (target instanceof B2) {
 >target instanceof B2 : boolean
diff --git a/tests/baselines/reference/narrowingOrderIndependent.types b/tests/baselines/reference/narrowingOrderIndependent.types
index a7e10335674..6e8a58b4160 100644
--- a/tests/baselines/reference/narrowingOrderIndependent.types
+++ b/tests/baselines/reference/narrowingOrderIndependent.types
@@ -28,8 +28,8 @@ const a = new A("123");
 >             : ^
 >A : typeof A
 >  : ^^^^^^^^
->"123" : string
->      : ^^^^^^
+>"123" : "123"
+>      : ^^^^^
 
 if (a instanceof A && a.stringOrUndefined) {
 >a instanceof A && a.stringOrUndefined : string | false | undefined
diff --git a/tests/baselines/reference/narrowingPastLastAssignment.types b/tests/baselines/reference/narrowingPastLastAssignment.types
index f000c83e94f..16513a09fdf 100644
--- a/tests/baselines/reference/narrowingPastLastAssignment.types
+++ b/tests/baselines/reference/narrowingPastLastAssignment.types
@@ -16,12 +16,12 @@ function f1(x: string | number) {
 >  : ^^^^^^^^^^^^^^^
 
     x = "abc";
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -34,12 +34,12 @@ function f1(x: string | number) {
 >  : ^^^^^^^^^^^^^^^
 
     x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     action(() => { x /* number */ });
 >action(() => { x /* number */ }) : void
@@ -63,12 +63,12 @@ function f2() {
 >  : ^^^^^^^^^^^^^^^
 
     x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     let a = () => { x /* number */ };
 >a : () => void
@@ -145,20 +145,20 @@ function f3(x: string | number) {
 >       : ^ ^^        ^^^^^^^^^
 >() => { x = "abc" } : () => void
 >                    : ^^^^^^^^^^
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -182,8 +182,8 @@ function f4(cond: () => boolean) {
     let x: string | number = 0;
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     while (cond()) {
 >cond() : boolean
@@ -192,12 +192,12 @@ function f4(cond: () => boolean) {
 >     : ^^^^^^       
 
         x = "abc";
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
         action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -210,12 +210,12 @@ function f4(cond: () => boolean) {
 >  : ^^^^^^^^^^^^^^^
 
         x = 42;
->x = 42 : number
->       : ^^^^^^
+>x = 42 : 42
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
         action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -253,12 +253,12 @@ function f5(x: string | number, cond: () => boolean) {
 >     : ^^^^^^       
 
         x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -272,12 +272,12 @@ function f5(x: string | number, cond: () => boolean) {
     }
     else {
         x = 2;
->x = 2 : number
->      : ^^^^^^
+>x = 2 : 2
+>      : ^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -315,12 +315,12 @@ function f5a(cond: boolean) {
 >  : ^^^^^^^^^^^^^^^^^^
 
         x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         action(() => { x /* number */ });
 >action(() => { x /* number */ }) : void
@@ -338,12 +338,12 @@ function f5a(cond: boolean) {
 >  : ^^^^^^^^^^^^^^^^^^
 
         x = 2;
->x = 2 : number
->      : ^^^^^^
+>x = 2 : 2
+>      : ^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         action(() => { x /* number */ });
 >action(() => { x /* number */ }) : void
@@ -491,12 +491,12 @@ let g: string | number;
 >  : ^^^^^^^^^^^^^^^
 
 g = "abc";
->g = "abc" : string
->          : ^^^^^^
+>g = "abc" : "abc"
+>          : ^^^^^
 >g : string | number
 >  : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 action(() => { g /* string | number */ });
 >action(() => { g /* string | number */ }) : void
@@ -519,12 +519,12 @@ namespace Foo {
 >  : ^^^^^^^^^^^^^^^
 
     x = "abc";
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     action(() => { x /* string | number */ });
 >action(() => { x /* string | number */ }) : void
@@ -541,12 +541,12 @@ namespace Foo {
 >  : ^^^^^^^^^^^^^^^
 
     y = "abc";
->y = "abc" : string
->          : ^^^^^^
+>y = "abc" : "abc"
+>          : ^^^^^
 >y : string | number
 >  : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     action(() => { y /* string */ });
 >action(() => { y /* string */ }) : void
@@ -570,12 +570,12 @@ function f10() {
 >  : ^^^^^^^^^^^^^^^^^^
 
     i = 0;
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     return (k: number) => k === i + 1;
 >(k: number) => k === i + 1 : (k: number) => boolean
@@ -605,8 +605,8 @@ function makeAdder(n?: number) {
 >        : ^^^^^^
 >n : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     return (m: number) => n + m;
 >(m: number) => n + m : (m: number) => number
@@ -685,8 +685,8 @@ function f12() {
 >       : ^^^^^^^^^^^^^^^^^^^^^
 >get : (key: string) => number[] | undefined
 >    : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
     if (foo == null) {
 >foo == null : boolean
diff --git a/tests/baselines/reference/narrowingPastLastAssignmentInModule.types b/tests/baselines/reference/narrowingPastLastAssignmentInModule.types
index c0e786f841c..4d64677cf1d 100644
--- a/tests/baselines/reference/narrowingPastLastAssignmentInModule.types
+++ b/tests/baselines/reference/narrowingPastLastAssignmentInModule.types
@@ -14,12 +14,12 @@ export let x1: string | number;
 >   : ^^^^^^^^^^^^^^^
 
 x1 = "abc";
->x1 = "abc" : string
->           : ^^^^^^
+>x1 = "abc" : "abc"
+>           : ^^^^^
 >x1 : string | number
 >   : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 action(() => { x1 /* string | number */ });
 >action(() => { x1 /* string | number */ }) : void
@@ -40,12 +40,12 @@ let x2: string | number;
 >   : ^^^^^^^^^^^^^^^
 
 x2 = "abc";
->x2 = "abc" : string
->           : ^^^^^^
+>x2 = "abc" : "abc"
+>           : ^^^^^
 >x2 : string | number
 >   : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 action(() => { x2 /* string | number */ });
 >action(() => { x2 /* string | number */ }) : void
@@ -68,12 +68,12 @@ let x3: string | number;
 >   : ^^^^^^^^^^^^^^^
 
 x3 = "abc";
->x3 = "abc" : string
->           : ^^^^^^
+>x3 = "abc" : "abc"
+>           : ^^^^^
 >x3 : string | number
 >   : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 action(() => { x3 /* string | number */ });
 >action(() => { x3 /* string | number */ }) : void
@@ -90,12 +90,12 @@ let x4: string | number;
 >   : ^^^^^^^^^^^^^^^
 
 x4 = "abc";
->x4 = "abc" : string
->           : ^^^^^^
+>x4 = "abc" : "abc"
+>           : ^^^^^
 >x4 : string | number
 >   : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 action(() => { x4 /* string */ });
 >action(() => { x4 /* string */ }) : void
@@ -116,12 +116,12 @@ let x5: string | number;
 >   : ^^^^^^^^^^^^^^^
 
 x5 = "abc";
->x5 = "abc" : string
->           : ^^^^^^
+>x5 = "abc" : "abc"
+>           : ^^^^^
 >x5 : string | number
 >   : ^^^^^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 action(() => { x5 /* string */ });
 >action(() => { x5 /* string */ }) : void
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types
index 1e47b7b3e3d..15e97f716a9 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.types
+++ b/tests/baselines/reference/negateOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types
index f73c7693b49..f1dae72d5b9 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.types
+++ b/tests/baselines/reference/negateOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -203,8 +203,8 @@ var ResultIsNumber12 = -STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // miss assignment operators
 -"";
diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.types b/tests/baselines/reference/nestedExcessPropertyChecking.types
index a67cd2dbe4e..556fe677a74 100644
--- a/tests/baselines/reference/nestedExcessPropertyChecking.types
+++ b/tests/baselines/reference/nestedExcessPropertyChecking.types
@@ -223,14 +223,14 @@ const response: Query = {
             light: 1,
 >light : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             dark: 3,
 >dark : number
 >     : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         },
     },
@@ -292,8 +292,8 @@ const TEST_VALUE: ExtendedValue = {
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >description : null
 >            : ^^^^
 
@@ -302,12 +302,12 @@ const TEST_VALUE: ExtendedValue = {
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >description : string
 >            : ^^^^^^
->'wigglytubble' : string
->               : ^^^^^^
+>'wigglytubble' : "wigglytubble"
+>               : ^^^^^^^^^^^^^^
 
     ]
 };
diff --git a/tests/baselines/reference/nestedGenericSpreadInference.types b/tests/baselines/reference/nestedGenericSpreadInference.types
index 39c6861260f..1d13f4dd71d 100644
--- a/tests/baselines/reference/nestedGenericSpreadInference.types
+++ b/tests/baselines/reference/nestedGenericSpreadInference.types
@@ -39,6 +39,6 @@ const leak = call(wrap(<T>(x: T) => x), 1);
 >  : ^
 >x : T
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/nestedLoops.types b/tests/baselines/reference/nestedLoops.types
index 64c5d5f1051..a762de1050d 100644
--- a/tests/baselines/reference/nestedLoops.types
+++ b/tests/baselines/reference/nestedLoops.types
@@ -12,24 +12,24 @@ export class Test  {
 >           : ^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
         let innerArray: Array<number> = [1, 2, 3];
 >innerArray : number[]
 >           : ^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
         for (let outer of outerArray)
 >outer : number
diff --git a/tests/baselines/reference/nestedModules.types b/tests/baselines/reference/nestedModules.types
index 83937cb8880..df7ba930ab5 100644
--- a/tests/baselines/reference/nestedModules.types
+++ b/tests/baselines/reference/nestedModules.types
@@ -30,12 +30,12 @@ module A {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types b/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types
index ae5fe05832c..c809f163670 100644
--- a/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types
+++ b/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types
@@ -29,7 +29,7 @@ const blah: Style = [
         foo: 'asdf',
 >foo : string
 >    : ^^^^^^
->'asdf' : string
+>'asdf' : "asdf"
 >       : ^^^^^^
 
         jj: 1 // intentional error
diff --git a/tests/baselines/reference/nestedRedeclarationInES6AMD.types b/tests/baselines/reference/nestedRedeclarationInES6AMD.types
index 829831eec99..42a4973ed1f 100644
--- a/tests/baselines/reference/nestedRedeclarationInES6AMD.types
+++ b/tests/baselines/reference/nestedRedeclarationInES6AMD.types
@@ -12,11 +12,11 @@ function a() {
 >  : ^
 
         status = 2;
->status = 2 : number
->           : ^^^^^^
+>status = 2 : 2
+>           : ^
 >status : number
 >       : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/neverInference.types b/tests/baselines/reference/neverInference.types
index b1e340fa2ac..f2234fd5294 100644
--- a/tests/baselines/reference/neverInference.types
+++ b/tests/baselines/reference/neverInference.types
@@ -120,8 +120,8 @@ f2(Array.from([0]), [], (a1, a2) => a1 - a2);
 >     : ^^^ ^^         ^^            ^^^   ^^^ ^^ ^^         ^^            ^^     ^^                      ^^       ^^^   ^^^   ^^^ ^^        ^^                          ^^^   ^^^ ^^ ^^        ^^                          ^^     ^^                      ^^       ^^^   ^^^   ^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >[] : never[]
 >   : ^^^^^^^
 >(a1, a2) => a1 - a2 : (a1: number, a2: number) => number
@@ -154,8 +154,8 @@ f2(Array.from([]), [0], (a1, a2) => a1 - a2);
 >   : ^^^^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >(a1, a2) => a1 - a2 : (a1: number, a2: number) => number
 >                    : ^  ^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^
 >a1 : number
diff --git a/tests/baselines/reference/neverReturningFunctions1.types b/tests/baselines/reference/neverReturningFunctions1.types
index c073cc80fd1..faf50f8a755 100644
--- a/tests/baselines/reference/neverReturningFunctions1.types
+++ b/tests/baselines/reference/neverReturningFunctions1.types
@@ -33,8 +33,8 @@ function f01(x: string | undefined) {
 >                           : ^^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"undefined argument" : string
->                     : ^^^^^^
+>"undefined argument" : "undefined argument"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
     x.length;  // string
 >x.length : number
@@ -66,8 +66,8 @@ function f02(x: number): number {
 >                        : ^^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"negative number" : string
->                  : ^^^^^^
+>"negative number" : "negative number"
+>                  : ^^^^^^^^^^^^^^^^^
 
     x;  // Unreachable
 >x : number
@@ -116,8 +116,8 @@ function f11(x: string | undefined, fail: (message?: string) => never) {
 >                           : ^^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"undefined argument" : string
->                     : ^^^^^^
+>"undefined argument" : "undefined argument"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
     x.length;  // string
 >x.length : number
@@ -153,8 +153,8 @@ function f12(x: number, fail: (message?: string) => never): number {
 >                        : ^^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"negative number" : string
->                  : ^^^^^^
+>"negative number" : "negative number"
+>                  : ^^^^^^^^^^^^^^^^^
 
     x;  // Unreachable
 >x : number
@@ -218,8 +218,8 @@ function f21(x: string | undefined) {
 >      : ^^^^^^^^^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"undefined argument" : string
->                     : ^^^^^^
+>"undefined argument" : "undefined argument"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
     x.length;  // string
 >x.length : number
@@ -255,8 +255,8 @@ function f22(x: number): number {
 >      : ^^^^^^^^^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"negative number" : string
->                  : ^^^^^^
+>"negative number" : "negative number"
+>                  : ^^^^^^^^^^^^^^^^^
 
     x;  // Unreachable
 >x : number
@@ -356,8 +356,8 @@ class Test {
 >     : ^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"undefined argument" : string
->                     : ^^^^^^
+>"undefined argument" : "undefined argument"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
         x.length;  // string
 >x.length : number
@@ -392,8 +392,8 @@ class Test {
 >     : ^^^^
 >fail : (message?: string) => never
 >     : ^       ^^^      ^^^^^     
->"negative number" : string
->                  : ^^^^^^
+>"negative number" : "negative number"
+>                  : ^^^^^^^^^^^^^^^^^
 
         x;  // Unreachable
 >x : number
@@ -844,8 +844,8 @@ const Component = registerComponent('test-component', {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^^
 >registerComponent : <T extends object>(name: string, component: ComponentDefinition<T>) => ComponentConstructor<T>
 >                  : ^ ^^^^^^^^^      ^^    ^^      ^^         ^^                      ^^^^^                       
->'test-component' : string
->                 : ^^^^^^
+>'test-component' : "test-component"
+>                 : ^^^^^^^^^^^^^^^^
 >{	schema: {		myProperty: {			default: [],			parse() {				return [true];			}		},		string: { type: 'string' },		num: 0	},	init() {		this.data.num = 0;		this.el.setAttribute('custom-attribute', 'custom-value');	},	update() {},	tick() {},	remove() {},	pause() {},	play() {},	multiply(f: number) {		// Reference to system because both were registered with the same name.		return f * this.data.num * this.system!.data.counter;	}} : { schema: { myProperty: { default: never[]; parse(): boolean[]; }; string: { type: string; }; num: number; }; init(): void; update(): void; tick(): void; remove(): void; pause(): void; play(): void; multiply(f: number): number; }
 >                                                                                                                                                                                                                                                                                                                                                                                                                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^
 
@@ -885,14 +885,14 @@ const Component = registerComponent('test-component', {
 >                   : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->'string' : string
->         : ^^^^^^
+>'string' : "string"
+>         : ^^^^^^^^
 
 		num: 0
 >num : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 	},
 	init() {
@@ -1086,7 +1086,7 @@ function foo(services: Readonly<Services>, s: string | null): string {
 >         : ^^^^^^^^^^^^^^^^^^
 >panic : (message: string) => never
 >      : ^       ^^      ^^^^^     
->"ouch" : string
+>"ouch" : "ouch"
 >       : ^^^^^^
 
     } else {
diff --git a/tests/baselines/reference/neverType.types b/tests/baselines/reference/neverType.types
index 16e8dc6d0c7..9d75ae4fb70 100644
--- a/tests/baselines/reference/neverType.types
+++ b/tests/baselines/reference/neverType.types
@@ -40,8 +40,8 @@ function fail() {
 >                          : ^^^^^
 >error : (message: string) => never
 >      : ^       ^^      ^^^^^     
->"Something failed" : string
->                   : ^^^^^^
+>"Something failed" : "Something failed"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function failOrThrow(shouldFail: boolean) {
@@ -120,8 +120,8 @@ function move1(direction: "up" | "down") {
 >                               : ^^^^^
 >error : (message: string) => never
 >      : ^       ^^      ^^^^^     
->"Should never get here" : string
->                        : ^^^^^^
+>"Should never get here" : "Should never get here"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 }
 
 function move2(direction: "up" | "down") {
@@ -161,8 +161,8 @@ function move2(direction: "up" | "down") {
 >                               : ^^^^^
 >error : (message: string) => never
 >      : ^       ^^      ^^^^^     
->"Should never get here" : string
->                        : ^^^^^^
+>"Should never get here" : "Should never get here"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 }
 
 function check<T>(x: T | undefined) {
@@ -180,8 +180,8 @@ function check<T>(x: T | undefined) {
 >                         : ^^^^^
 >error : (message: string) => never
 >      : ^       ^^      ^^^^^     
->"Undefined value" : string
->                  : ^^^^^^
+>"Undefined value" : "Undefined value"
+>                  : ^^^^^^^^^^^^^^^^^
 }
 
 class C {
@@ -303,8 +303,8 @@ let errorCallback = () => error("Error callback");
 >                        : ^^^^^
 >error : (message: string) => never
 >      : ^       ^^      ^^^^^     
->"Error callback" : string
->                 : ^^^^^^
+>"Error callback" : "Error callback"
+>                 : ^^^^^^^^^^^^^^^^
 
 test(() => "hello");
 >test(() => "hello") : string
@@ -313,8 +313,8 @@ test(() => "hello");
 >     : ^  ^^            ^^^^^^^^^^^
 >() => "hello" : () => string
 >              : ^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 test(() => fail());
 >test(() => fail()) : string
diff --git a/tests/baselines/reference/neverTypeErrors1.types b/tests/baselines/reference/neverTypeErrors1.types
index c05edd737cb..1f5248472c0 100644
--- a/tests/baselines/reference/neverTypeErrors1.types
+++ b/tests/baselines/reference/neverTypeErrors1.types
@@ -10,20 +10,20 @@ function f1() {
 >  : ^^^^^
 
     x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : never
 >  : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x = "abc";
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : never
 >  : ^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     x = false;
 >x = false : false
@@ -74,8 +74,8 @@ function f3(): never {
 >   : ^^^^^^     
 
     return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 function f4(): never {
diff --git a/tests/baselines/reference/neverTypeErrors2.types b/tests/baselines/reference/neverTypeErrors2.types
index 6cd5eec516a..e67b036827f 100644
--- a/tests/baselines/reference/neverTypeErrors2.types
+++ b/tests/baselines/reference/neverTypeErrors2.types
@@ -10,20 +10,20 @@ function f1() {
 >  : ^^^^^
 
     x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : never
 >  : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     x = "abc";
->x = "abc" : string
->          : ^^^^^^
+>x = "abc" : "abc"
+>          : ^^^^^
 >x : never
 >  : ^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     x = false;
 >x = false : false
@@ -74,8 +74,8 @@ function f3(): never {
 >   : ^^^^^^     
 
     return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 function f4(): never {
diff --git a/tests/baselines/reference/newLineFlagWithCRLF.types b/tests/baselines/reference/newLineFlagWithCRLF.types
index 7cac57414c3..36c617dd052 100644
--- a/tests/baselines/reference/newLineFlagWithCRLF.types
+++ b/tests/baselines/reference/newLineFlagWithCRLF.types
@@ -8,11 +8,11 @@ var x=1;
 >  : ^
 
 x=2;
->x=2 : number
->    : ^^^^^^
+>x=2 : 2
+>    : ^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 
diff --git a/tests/baselines/reference/newLineFlagWithLF.types b/tests/baselines/reference/newLineFlagWithLF.types
index f0c2a2afca7..3b077900666 100644
--- a/tests/baselines/reference/newLineFlagWithLF.types
+++ b/tests/baselines/reference/newLineFlagWithLF.types
@@ -8,11 +8,11 @@ var x=1;
 >  : ^
 
 x=2;
->x=2 : number
->    : ^^^^^^
+>x=2 : 2
+>    : ^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 
diff --git a/tests/baselines/reference/newOperatorConformance.types b/tests/baselines/reference/newOperatorConformance.types
index 38445ebd409..869134f639c 100644
--- a/tests/baselines/reference/newOperatorConformance.types
+++ b/tests/baselines/reference/newOperatorConformance.types
@@ -131,8 +131,8 @@ function newFn2<T extends { new (s: number): string}>(s: T) {
 >          : ^^^^^^
 >s : T
 >  : ^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
     var p: string;
 >p : string
diff --git a/tests/baselines/reference/newOperatorErrorCases.types b/tests/baselines/reference/newOperatorErrorCases.types
index 43e7ec5c673..5258ba38bb4 100644
--- a/tests/baselines/reference/newOperatorErrorCases.types
+++ b/tests/baselines/reference/newOperatorErrorCases.types
@@ -91,8 +91,8 @@ var c2 = new T<string>;  // Ok
 function fnNumber(): number { return 32; }
 >fnNumber : () => number
 >         : ^^^^^^      
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
 var s = new fnNumber(); // Error
 >s : any
diff --git a/tests/baselines/reference/newOperatorErrorCases_noImplicitAny.types b/tests/baselines/reference/newOperatorErrorCases_noImplicitAny.types
index 08ec318d82b..8b3343685bd 100644
--- a/tests/baselines/reference/newOperatorErrorCases_noImplicitAny.types
+++ b/tests/baselines/reference/newOperatorErrorCases_noImplicitAny.types
@@ -6,8 +6,8 @@ function fnNumber(this: void): number { return 90; }
 >         : ^    ^^    ^^^^^      
 >this : void
 >     : ^^^^
->90 : number
->   : ^^^^^^
+>90 : 90
+>   : ^^
 
 new fnNumber(); // Error
 >new fnNumber() : any
diff --git a/tests/baselines/reference/newWithSpread.types b/tests/baselines/reference/newWithSpread.types
index 5c3701928e7..248d3467604 100644
--- a/tests/baselines/reference/newWithSpread.types
+++ b/tests/baselines/reference/newWithSpread.types
@@ -104,21 +104,21 @@ new f(1, 2, "string");
 >new f(1, 2, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new f(1, 2, ...a);
 >new f(1, 2, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -128,16 +128,16 @@ new f(1, 2, ...a, "string");
 >new f(1, 2, ...a, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Multiple spreads arguments
 new f2(...a, ...a);
@@ -157,10 +157,10 @@ new f(1 ,2, ...a, ...a);
 >new f(1 ,2, ...a, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -176,22 +176,22 @@ new f(1, 2, "string")();
 >new f(1, 2, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new f(1, 2, ...a)();
 >new f(1, 2, ...a)() : any
 >new f(1, 2, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -202,16 +202,16 @@ new f(1, 2, ...a, "string")();
 >new f(1, 2, ...a, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Property access expression
 new b.f(1, 2, "string");
@@ -222,12 +222,12 @@ new b.f(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new b.f(1, 2, ...a);
 >new b.f(1, 2, ...a) : any
@@ -237,10 +237,10 @@ new b.f(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -254,16 +254,16 @@ new b.f(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Parenthesised expression
 new (b.f)(1, 2, "string");
@@ -276,12 +276,12 @@ new (b.f)(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new (b.f)(1, 2, ...a);
 >new (b.f)(1, 2, ...a) : any
@@ -293,10 +293,10 @@ new (b.f)(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -312,16 +312,16 @@ new (b.f)(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression
 new d[1].f(1, 2, "string");
@@ -336,12 +336,12 @@ new d[1].f(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new d[1].f(1, 2, ...a);
 >new d[1].f(1, 2, ...a) : any
@@ -355,10 +355,10 @@ new d[1].f(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -376,16 +376,16 @@ new d[1].f(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a punctuated key
 new e["a-b"].f(1, 2, "string");
@@ -400,12 +400,12 @@ new e["a-b"].f(1, 2, "string");
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new e["a-b"].f(1, 2, ...a);
 >new e["a-b"].f(1, 2, ...a) : any
@@ -419,10 +419,10 @@ new e["a-b"].f(1, 2, ...a);
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -440,16 +440,16 @@ new e["a-b"].f(1, 2, ...a, "string");
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Basic expression
 new B(1, 2, "string");
@@ -457,22 +457,22 @@ new B(1, 2, "string");
 >                      : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new B(1, 2, ...a);
 >new B(1, 2, ...a) : B
 >                  : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -483,16 +483,16 @@ new B(1, 2, ...a, "string");
 >                            : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Property access expression
 new c["a-b"](1, 2, "string");
@@ -504,12 +504,12 @@ new c["a-b"](1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new c["a-b"](1, 2, ...a);
 >new c["a-b"](1, 2, ...a) : B
@@ -520,10 +520,10 @@ new c["a-b"](1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -538,16 +538,16 @@ new c["a-b"](1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Parenthesised expression
 new (c["a-b"])(1, 2, "string");
@@ -561,12 +561,12 @@ new (c["a-b"])(1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new (c["a-b"])(1, 2, ...a);
 >new (c["a-b"])(1, 2, ...a) : B
@@ -579,10 +579,10 @@ new (c["a-b"])(1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -599,16 +599,16 @@ new (c["a-b"])(1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression
 new g[1]["a-b"](1, 2, "string");
@@ -624,12 +624,12 @@ new g[1]["a-b"](1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new g[1]["a-b"](1, 2, ...a);
 >new g[1]["a-b"](1, 2, ...a) : B
@@ -644,10 +644,10 @@ new g[1]["a-b"](1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -666,16 +666,16 @@ new g[1]["a-b"](1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a punctuated key
 new h["a-b"]["a-b"](1, 2, "string");
@@ -691,12 +691,12 @@ new h["a-b"]["a-b"](1, 2, "string");
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new h["a-b"]["a-b"](1, 2, ...a);
 >new h["a-b"]["a-b"](1, 2, ...a) : B
@@ -711,10 +711,10 @@ new h["a-b"]["a-b"](1, 2, ...a);
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -733,16 +733,16 @@ new h["a-b"]["a-b"](1, 2, ...a, "string");
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a number
 new i["a-b"][1](1, 2, "string");
diff --git a/tests/baselines/reference/newWithSpreadES5.types b/tests/baselines/reference/newWithSpreadES5.types
index e4a12793009..b8c441b641d 100644
--- a/tests/baselines/reference/newWithSpreadES5.types
+++ b/tests/baselines/reference/newWithSpreadES5.types
@@ -103,21 +103,21 @@ new f(1, 2, "string");
 >new f(1, 2, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new f(1, 2, ...a);
 >new f(1, 2, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -127,16 +127,16 @@ new f(1, 2, ...a, "string");
 >new f(1, 2, ...a, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Multiple spreads arguments
 new f2(...a, ...a);
@@ -156,10 +156,10 @@ new f(1 ,2, ...a, ...a);
 >new f(1 ,2, ...a, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -175,22 +175,22 @@ new f(1, 2, "string")();
 >new f(1, 2, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new f(1, 2, ...a)();
 >new f(1, 2, ...a)() : any
 >new f(1, 2, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -201,16 +201,16 @@ new f(1, 2, ...a, "string")();
 >new f(1, 2, ...a, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Property access expression
 new b.f(1, 2, "string");
@@ -221,12 +221,12 @@ new b.f(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new b.f(1, 2, ...a);
 >new b.f(1, 2, ...a) : any
@@ -236,10 +236,10 @@ new b.f(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -253,16 +253,16 @@ new b.f(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Parenthesised expression
 new (b.f)(1, 2, "string");
@@ -275,12 +275,12 @@ new (b.f)(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new (b.f)(1, 2, ...a);
 >new (b.f)(1, 2, ...a) : any
@@ -292,10 +292,10 @@ new (b.f)(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -311,16 +311,16 @@ new (b.f)(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression
 new d[1].f(1, 2, "string");
@@ -335,12 +335,12 @@ new d[1].f(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new d[1].f(1, 2, ...a);
 >new d[1].f(1, 2, ...a) : any
@@ -354,10 +354,10 @@ new d[1].f(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -375,16 +375,16 @@ new d[1].f(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a punctuated key
 new e["a-b"].f(1, 2, "string");
@@ -399,12 +399,12 @@ new e["a-b"].f(1, 2, "string");
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new e["a-b"].f(1, 2, ...a);
 >new e["a-b"].f(1, 2, ...a) : any
@@ -418,10 +418,10 @@ new e["a-b"].f(1, 2, ...a);
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -439,16 +439,16 @@ new e["a-b"].f(1, 2, ...a, "string");
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Basic expression
 new B(1, 2, "string");
@@ -456,22 +456,22 @@ new B(1, 2, "string");
 >                      : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new B(1, 2, ...a);
 >new B(1, 2, ...a) : B
 >                  : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -482,16 +482,16 @@ new B(1, 2, ...a, "string");
 >                            : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Property access expression
 new c["a-b"](1, 2, "string");
@@ -503,12 +503,12 @@ new c["a-b"](1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new c["a-b"](1, 2, ...a);
 >new c["a-b"](1, 2, ...a) : B
@@ -519,10 +519,10 @@ new c["a-b"](1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -537,16 +537,16 @@ new c["a-b"](1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Parenthesised expression
 new (c["a-b"])(1, 2, "string");
@@ -560,12 +560,12 @@ new (c["a-b"])(1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new (c["a-b"])(1, 2, ...a);
 >new (c["a-b"])(1, 2, ...a) : B
@@ -578,10 +578,10 @@ new (c["a-b"])(1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -598,16 +598,16 @@ new (c["a-b"])(1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression
 new g[1]["a-b"](1, 2, "string");
@@ -623,12 +623,12 @@ new g[1]["a-b"](1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new g[1]["a-b"](1, 2, ...a);
 >new g[1]["a-b"](1, 2, ...a) : B
@@ -643,10 +643,10 @@ new g[1]["a-b"](1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -665,16 +665,16 @@ new g[1]["a-b"](1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a punctuated key
 new h["a-b"]["a-b"](1, 2, "string");
@@ -690,12 +690,12 @@ new h["a-b"]["a-b"](1, 2, "string");
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new h["a-b"]["a-b"](1, 2, ...a);
 >new h["a-b"]["a-b"](1, 2, ...a) : B
@@ -710,10 +710,10 @@ new h["a-b"]["a-b"](1, 2, ...a);
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -732,16 +732,16 @@ new h["a-b"]["a-b"](1, 2, ...a, "string");
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a number
 new i["a-b"][1](1, 2, "string");
diff --git a/tests/baselines/reference/newWithSpreadES6.types b/tests/baselines/reference/newWithSpreadES6.types
index 8a90b7d2b13..421bf2226cf 100644
--- a/tests/baselines/reference/newWithSpreadES6.types
+++ b/tests/baselines/reference/newWithSpreadES6.types
@@ -104,21 +104,21 @@ new f(1, 2, "string");
 >new f(1, 2, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new f(1, 2, ...a);
 >new f(1, 2, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -128,16 +128,16 @@ new f(1, 2, ...a, "string");
 >new f(1, 2, ...a, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Multiple spreads arguments
 new f2(...a, ...a);
@@ -157,10 +157,10 @@ new f(1 ,2, ...a, ...a);
 >new f(1 ,2, ...a, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -176,22 +176,22 @@ new f(1, 2, "string")();
 >new f(1, 2, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new f(1, 2, ...a)();
 >new f(1, 2, ...a)() : any
 >new f(1, 2, ...a) : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -202,16 +202,16 @@ new f(1, 2, ...a, "string")();
 >new f(1, 2, ...a, "string") : any
 >f : (x: number, y: number, ...z: string[]) => void
 >  : ^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Property access expression
 new b.f(1, 2, "string");
@@ -222,12 +222,12 @@ new b.f(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new b.f(1, 2, ...a);
 >new b.f(1, 2, ...a) : any
@@ -237,10 +237,10 @@ new b.f(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -254,16 +254,16 @@ new b.f(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Parenthesised expression
 new (b.f)(1, 2, "string");
@@ -276,12 +276,12 @@ new (b.f)(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new (b.f)(1, 2, ...a);
 >new (b.f)(1, 2, ...a) : any
@@ -293,10 +293,10 @@ new (b.f)(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -312,16 +312,16 @@ new (b.f)(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression
 new d[1].f(1, 2, "string");
@@ -336,12 +336,12 @@ new d[1].f(1, 2, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new d[1].f(1, 2, ...a);
 >new d[1].f(1, 2, ...a) : any
@@ -355,10 +355,10 @@ new d[1].f(1, 2, ...a);
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -376,16 +376,16 @@ new d[1].f(1, 2, ...a, "string");
 >  : ^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a punctuated key
 new e["a-b"].f(1, 2, "string");
@@ -400,12 +400,12 @@ new e["a-b"].f(1, 2, "string");
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new e["a-b"].f(1, 2, ...a);
 >new e["a-b"].f(1, 2, ...a) : any
@@ -419,10 +419,10 @@ new e["a-b"].f(1, 2, ...a);
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -440,16 +440,16 @@ new e["a-b"].f(1, 2, ...a, "string");
 >      : ^^^^^
 >f : new (x: number, y: number, ...z: string[]) => any
 >  : ^^^^^ ^^      ^^ ^^      ^^^^^ ^^        ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Basic expression
 new B(1, 2, "string");
@@ -457,22 +457,22 @@ new B(1, 2, "string");
 >                      : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new B(1, 2, ...a);
 >new B(1, 2, ...a) : B
 >                  : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -483,16 +483,16 @@ new B(1, 2, ...a, "string");
 >                            : ^
 >B : typeof B
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Property access expression
 new c["a-b"](1, 2, "string");
@@ -504,12 +504,12 @@ new c["a-b"](1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new c["a-b"](1, 2, ...a);
 >new c["a-b"](1, 2, ...a) : B
@@ -520,10 +520,10 @@ new c["a-b"](1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -538,16 +538,16 @@ new c["a-b"](1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Parenthesised expression
 new (c["a-b"])(1, 2, "string");
@@ -561,12 +561,12 @@ new (c["a-b"])(1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new (c["a-b"])(1, 2, ...a);
 >new (c["a-b"])(1, 2, ...a) : B
@@ -579,10 +579,10 @@ new (c["a-b"])(1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -599,16 +599,16 @@ new (c["a-b"])(1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression
 new g[1]["a-b"](1, 2, "string");
@@ -624,12 +624,12 @@ new g[1]["a-b"](1, 2, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new g[1]["a-b"](1, 2, ...a);
 >new g[1]["a-b"](1, 2, ...a) : B
@@ -644,10 +644,10 @@ new g[1]["a-b"](1, 2, ...a);
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -666,16 +666,16 @@ new g[1]["a-b"](1, 2, ...a, "string");
 >  : ^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a punctuated key
 new h["a-b"]["a-b"](1, 2, "string");
@@ -691,12 +691,12 @@ new h["a-b"]["a-b"](1, 2, "string");
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 new h["a-b"]["a-b"](1, 2, ...a);
 >new h["a-b"]["a-b"](1, 2, ...a) : B
@@ -711,10 +711,10 @@ new h["a-b"]["a-b"](1, 2, ...a);
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
@@ -733,16 +733,16 @@ new h["a-b"]["a-b"](1, 2, ...a, "string");
 >      : ^^^^^
 >"a-b" : "a-b"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...a : string
 >     : ^^^^^^
 >a : string[]
 >  : ^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 // Element access expression with a number
 new i["a-b"][1](1, 2, "string");
diff --git a/tests/baselines/reference/noCheckDoesNotReportError.types b/tests/baselines/reference/noCheckDoesNotReportError.types
index 1188af1ad1b..dc2b679b4fb 100644
--- a/tests/baselines/reference/noCheckDoesNotReportError.types
+++ b/tests/baselines/reference/noCheckDoesNotReportError.types
@@ -4,6 +4,6 @@
 export const a: number = "not ok";
 >a : number
 >  : ^^^^^^
->"not ok" : string
->         : ^^^^^^
+>"not ok" : "not ok"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/noCheckNoEmit.types b/tests/baselines/reference/noCheckNoEmit.types
index 7a3651b61dd..4ff6200a0d7 100644
--- a/tests/baselines/reference/noCheckNoEmit.types
+++ b/tests/baselines/reference/noCheckNoEmit.types
@@ -4,6 +4,6 @@
 export const a: number = "not ok";
 >a : number
 >  : ^^^^^^
->"not ok" : string
->         : ^^^^^^
+>"not ok" : "not ok"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/noCheckRequiresEmitDeclarationOnly.types b/tests/baselines/reference/noCheckRequiresEmitDeclarationOnly.types
index 4afef6bf57f..561d967a238 100644
--- a/tests/baselines/reference/noCheckRequiresEmitDeclarationOnly.types
+++ b/tests/baselines/reference/noCheckRequiresEmitDeclarationOnly.types
@@ -4,6 +4,6 @@
 export const a: number = "not ok";
 >a : number
 >  : ^^^^^^
->"not ok" : string
->         : ^^^^^^
+>"not ok" : "not ok"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.types
index f3a7225a7da..7ad572ca2a4 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.types
@@ -39,8 +39,8 @@ class class1 {
         }
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set a(val: number) {
 >a : number
@@ -118,8 +118,8 @@ class class2 {
         }
 
         return 10;
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     set a(val: number) {
 >a : number
diff --git a/tests/baselines/reference/noCrashOnImportShadowing.types b/tests/baselines/reference/noCrashOnImportShadowing.types
index c33d3b44507..820da5cd2c2 100644
--- a/tests/baselines/reference/noCrashOnImportShadowing.types
+++ b/tests/baselines/reference/noCrashOnImportShadowing.types
@@ -25,8 +25,8 @@ const x: B = { x: "" };
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 B.zzz;
 >B.zzz : 123
@@ -52,8 +52,8 @@ const x: B = { x: "" };
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 B.zzz;
 >B.zzz : 123
diff --git a/tests/baselines/reference/noCrashOnThisTypeUsage.types b/tests/baselines/reference/noCrashOnThisTypeUsage.types
index dd955a7cd38..f65f88aa9b6 100644
--- a/tests/baselines/reference/noCrashOnThisTypeUsage.types
+++ b/tests/baselines/reference/noCrashOnThisTypeUsage.types
@@ -58,8 +58,8 @@ export class ObservableValue<T> {
             type: "update",
 >type : string
 >     : ^^^^^^
->"update" : string
->         : ^^^^^^
+>"update" : "update"
+>         : ^^^^^^^^
 
             object: this,
 >object : this
diff --git a/tests/baselines/reference/noEmitOnError.types b/tests/baselines/reference/noEmitOnError.types
index 66985e7b260..955420e7f89 100644
--- a/tests/baselines/reference/noEmitOnError.types
+++ b/tests/baselines/reference/noEmitOnError.types
@@ -4,6 +4,6 @@
 var x: number = "";
 >x : number
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.types b/tests/baselines/reference/noImplicitAnyInCastExpression.types
index 3be90490f73..27b4629de36 100644
--- a/tests/baselines/reference/noImplicitAnyInCastExpression.types
+++ b/tests/baselines/reference/noImplicitAnyInCastExpression.types
@@ -34,8 +34,8 @@ interface IFoo {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >b : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
diff --git a/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.types b/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.types
index 48b0feb84e5..34f4a4a2cc8 100644
--- a/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.types
+++ b/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.types
@@ -34,6 +34,6 @@ regexMatchList.forEach(match => ''.replace(match, ''));
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >match : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.types b/tests/baselines/reference/noImplicitAnyIndexing.types
index 44de275a520..5376b1db658 100644
--- a/tests/baselines/reference/noImplicitAnyIndexing.types
+++ b/tests/baselines/reference/noImplicitAnyIndexing.types
@@ -134,20 +134,20 @@ var m: MyMap<number> = {
     "0": 0,
 >"0" : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     "1": 1,
 >"1" : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     "2": 2,
 >"2" : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     "Okay that's enough for today.": NaN
 >"Okay that's enough for today." : number
diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
index c427792e478..90539ba4cfc 100644
--- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
+++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
@@ -133,20 +133,20 @@ var m: MyMap<number> = {
     "0": 0,
 >"0" : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     "1": 1,
 >"1" : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     "2": 2,
 >"2" : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     "Okay that's enough for today.": NaN
 >"Okay that's enough for today." : number
diff --git a/tests/baselines/reference/noImplicitReturnsExclusions.types b/tests/baselines/reference/noImplicitReturnsExclusions.types
index a04bfbaf07a..aa62f01d430 100644
--- a/tests/baselines/reference/noImplicitReturnsExclusions.types
+++ b/tests/baselines/reference/noImplicitReturnsExclusions.types
@@ -281,8 +281,8 @@ registerCommand("_references-view.showHistoryItem", async (item) => { // Error,
 >                                                                                                                                                                                                                                      : ^^^^
 >registerCommand : (command: string, callback: (...args: any[]) => any, thisArg?: any) => void
 >                : ^       ^^      ^^        ^^                       ^^       ^^^   ^^^^^    
->"_references-view.showHistoryItem" : string
->                                   : ^^^^^^
+>"_references-view.showHistoryItem" : "_references-view.showHistoryItem"
+>                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >async (item) => { // Error, contextual return type of Promise<unknown>  if (item instanceof HistoryItem) {    return executeCommand("vscode.open", item.input.location.uri);  }} : (item: any) => Promise<unknown>
 >                                                                                                                                                                                 : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >item : any
@@ -301,8 +301,8 @@ registerCommand("_references-view.showHistoryItem", async (item) => { // Error,
 >                                                       : ^^^^^^^^^^^^^^^^^
 >executeCommand : <T = unknown>(command: string, ...rest: any[]) => Thenable<T>
 >               : ^ ^^^^^^^^^^^^       ^^      ^^^^^    ^^     ^^^^^           
->"vscode.open" : string
->              : ^^^^^^
+>"vscode.open" : "vscode.open"
+>              : ^^^^^^^^^^^^^
 >item.input.location.uri : string
 >                        : ^^^^^^
 >item.input.location : { uri: string; }
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync1.types b/tests/baselines/reference/noImplicitReturnsInAsync1.types
index c059fd6499e..82d7c343860 100644
--- a/tests/baselines/reference/noImplicitReturnsInAsync1.types
+++ b/tests/baselines/reference/noImplicitReturnsInAsync1.types
@@ -32,6 +32,6 @@ async function test(isError: boolean = false) {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"The test is passed without an error." : string
->                                       : ^^^^^^
+>"The test is passed without an error." : "The test is passed without an error."
+>                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types
index 6835be82fc9..5adbbc531a2 100644
--- a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types
@@ -28,7 +28,7 @@ function main1() : number {
 >                  : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->"in finally" : string
->             : ^^^^^^
+>"in finally" : "in finally"
+>             : ^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.types b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.types
index d1b5c810920..06dcfe7b4e6 100644
--- a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.types
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.types
@@ -31,8 +31,8 @@ function main1() : number {
 >                : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->"in catch" : string
->           : ^^^^^^
+>"in catch" : "in catch"
+>           : ^^^^^^^^^^
     }
     finally {
         log("in finally");
@@ -40,7 +40,7 @@ function main1() : number {
 >                  : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->"in finally" : string
->             : ^^^^^^
+>"in finally" : "in finally"
+>             : ^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.types b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.types
index fc7757c8532..9ce851da9cd 100644
--- a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.types
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.types
@@ -31,7 +31,7 @@ function main1() : number {
 >                : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->"in catch" : string
->           : ^^^^^^
+>"in catch" : "in catch"
+>           : ^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/noInfer.types b/tests/baselines/reference/noInfer.types
index 517a940c343..81317b60967 100644
--- a/tests/baselines/reference/noInfer.types
+++ b/tests/baselines/reference/noInfer.types
@@ -282,14 +282,14 @@ assertEqual({ x: 1 }, { x: 3 }); // ok
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ x: 3 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 const g = { x: 3, y: 2 };
 >g : { x: number; y: number; }
@@ -316,8 +316,8 @@ assertEqual(g, { x: 3 }); // error
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 declare function invoke<T, R>(func: (value: T) => R, value: NoInfer<T>): R;
 >invoke : <T, R>(func: (value: T) => R, value: NoInfer<T>) => R
@@ -348,8 +348,8 @@ invoke(test, { x: 1, y: 2 }); // error
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
 >2 : 2
@@ -364,8 +364,8 @@ test({ x: 1, y: 2 }); // error
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
 >2 : 2
@@ -402,8 +402,8 @@ doWork(comp, { foo: 42 }); // ok
 >            : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 doWork(comp, {}); // error
 >doWork(comp, {}) : void
diff --git a/tests/baselines/reference/noInferUnionExcessPropertyCheck1.types b/tests/baselines/reference/noInferUnionExcessPropertyCheck1.types
index c4adc230c3a..b1394d0e58c 100644
--- a/tests/baselines/reference/noInferUnionExcessPropertyCheck1.types
+++ b/tests/baselines/reference/noInferUnionExcessPropertyCheck1.types
@@ -26,14 +26,14 @@ test1({ x: "foo" }, { x: "bar" }); // no error
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ x: "bar" } : { x: string; }
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 test1({ x: "foo" }, { x: "bar", y: 42 }); // epc error
 >test1({ x: "foo" }, { x: "bar", y: 42 }) : void
@@ -44,14 +44,14 @@ test1({ x: "foo" }, { x: "bar", y: 42 }); // epc error
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ x: "bar", y: 42 } : { x: string; y: number; }
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 >y : number
 >  : ^^^^^^
 >42 : 42
@@ -82,14 +82,14 @@ test2({ x: "foo" }, { x: "bar" }); // no error
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ x: "bar" } : { x: string; }
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 test2({ x: "foo" }, { x: "bar", y: 42 }); // epc error
 >test2({ x: "foo" }, { x: "bar", y: 42 }) : void
@@ -100,14 +100,14 @@ test2({ x: "foo" }, { x: "bar", y: 42 }); // epc error
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ x: "bar", y: 42 } : { x: string; y: number; }
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 >y : number
 >  : ^^^^^^
 >42 : 42
@@ -138,14 +138,14 @@ test3({ x: "foo" }, { x: "bar" }); // no error
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ x: "bar" } : { x: string; }
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 test3({ x: "foo" }, { x: "bar", y: 42 }); // epc error
 >test3({ x: "foo" }, { x: "bar", y: 42 }) : void
@@ -156,14 +156,14 @@ test3({ x: "foo" }, { x: "bar", y: 42 }); // epc error
 >             : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >{ x: "bar", y: 42 } : { x: string; y: number; }
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 >y : number
 >  : ^^^^^^
 >42 : 42
diff --git a/tests/baselines/reference/noObjectKeysToKeyofT.types b/tests/baselines/reference/noObjectKeysToKeyofT.types
index b4c6ab799c3..67cdb477bc6 100644
--- a/tests/baselines/reference/noObjectKeysToKeyofT.types
+++ b/tests/baselines/reference/noObjectKeysToKeyofT.types
@@ -24,8 +24,8 @@ Object.keys({ a: 0 }).push("b");
 >  : ^
 >push : (...items: string[]) => number
 >     : ^^^^     ^^^^^^^^^^^^^^^      
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 // See also
 // https://stackoverflow.com/questions/55012174/why-doesnt-object-keys-return-a-keyof-type-in-typescript
diff --git a/tests/baselines/reference/noUncheckedIndexedAccess.types b/tests/baselines/reference/noUncheckedIndexedAccess.types
index a0f668dc1c4..35a00a1931b 100644
--- a/tests/baselines/reference/noUncheckedIndexedAccess.types
+++ b/tests/baselines/reference/noUncheckedIndexedAccess.types
@@ -94,8 +94,8 @@ const e4: boolean = strMap[0 as string | number];
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 as string | number : string | number
 >                     : ^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const e5: boolean = strMap[0 as string | 0 | 1];
 >e5 : boolean
@@ -360,8 +360,8 @@ const num_ok2: boolean = numMap[0 as number];
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 as number : number
 >            : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const num_ok3: boolean = numMap[0 as 0 | 1];
 >num_ok3 : boolean
diff --git a/tests/baselines/reference/noUnusedLocals_writeOnly.types b/tests/baselines/reference/noUnusedLocals_writeOnly.types
index eeafa6e7ae8..c8a04b3b4b1 100644
--- a/tests/baselines/reference/noUnusedLocals_writeOnly.types
+++ b/tests/baselines/reference/noUnusedLocals_writeOnly.types
@@ -15,12 +15,12 @@ function f(x = 0, b = false) {
 
     // None of these statements read from 'x', so it will be marked unused.
     x = 1;
->x = 1 : number
->      : ^^^^^^
+>x = 1 : 1
+>      : ^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     ([x] = [1]);
 >([x] = [1]) : [number]
@@ -33,8 +33,8 @@ function f(x = 0, b = false) {
 >  : ^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     ({ x } = { x: 1 });
 >({ x } = { x: 1 }) : { x: number; }
@@ -49,8 +49,8 @@ function f(x = 0, b = false) {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     ({ x: x } = { x: 1 });
 >({ x: x } = { x: 1 }) : { x: number; }
@@ -67,8 +67,8 @@ function f(x = 0, b = false) {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     ({ a: [{ b: x }] } = { a: [{ b: 1 }] });
 >({ a: [{ b: x }] } = { a: [{ b: 1 }] }) : { a: [{ b: number; }]; }
@@ -97,8 +97,8 @@ function f(x = 0, b = false) {
 >         : ^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     ({ x = 2 } = { x: b ? 1 : undefined });
 >({ x = 2 } = { x: b ? 1 : undefined }) : { x?: number | undefined; }
@@ -115,12 +115,12 @@ function f(x = 0, b = false) {
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->b ? 1 : undefined : number | undefined
->                  : ^^^^^^^^^^^^^^^^^^
+>b ? 1 : undefined : 1 | undefined
+>                  : ^^^^^^^^^^^^^
 >b : boolean
 >  : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -145,12 +145,12 @@ function f(x = 0, b = false) {
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->b ? 1 : undefined : number | undefined
->                  : ^^^^^^^^^^^^^^^^^^
+>b ? 1 : undefined : 1 | undefined
+>                  : ^^^^^^^^^^^^^
 >b : boolean
 >  : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -182,12 +182,12 @@ function f(x = 0, b = false) {
 >         : ^^^^
 >f : (x?: number, b?: boolean) => void
 >  : ^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
->z = 1 : number
->      : ^^^^^^
+>z = 1 : 1
+>      : ^
 >z : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 function f2(_: ReadonlyArray<number>): void {}
 >f2 : (_: ReadonlyArray<number>) => void
diff --git a/tests/baselines/reference/noUnusedLocals_writeOnlyProperty_dynamicNames.types b/tests/baselines/reference/noUnusedLocals_writeOnlyProperty_dynamicNames.types
index 80fa042fa07..8fb1ce55962 100644
--- a/tests/baselines/reference/noUnusedLocals_writeOnlyProperty_dynamicNames.types
+++ b/tests/baselines/reference/noUnusedLocals_writeOnlyProperty_dynamicNames.types
@@ -8,8 +8,8 @@ const x = Symbol("x");
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 
 const y = Symbol("y");
 >y : unique symbol
@@ -18,8 +18,8 @@ const y = Symbol("y");
 >            : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 
 class C {
 >C : C
@@ -42,16 +42,16 @@ class C {
 >  : ^^^^^^^^^^
 
         this[x] = 0; // write-only
->this[x] = 0 : number
->            : ^^^^^^
+>this[x] = 0 : 0
+>            : ^
 >this[x] : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >x : unique symbol
 >  : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this[y];
 >this[y] : number
diff --git a/tests/baselines/reference/nodeModules1(module=node16).types b/tests/baselines/reference/nodeModules1(module=node16).types
index fedc4305fcc..49631af15a8 100644
--- a/tests/baselines/reference/nodeModules1(module=node16).types
+++ b/tests/baselines/reference/nodeModules1(module=node16).types
@@ -457,88 +457,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
@@ -901,88 +901,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // cjs format file
 const x = 1;
@@ -1344,88 +1344,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
diff --git a/tests/baselines/reference/nodeModules1(module=nodenext).types b/tests/baselines/reference/nodeModules1(module=nodenext).types
index fedc4305fcc..49631af15a8 100644
--- a/tests/baselines/reference/nodeModules1(module=nodenext).types
+++ b/tests/baselines/reference/nodeModules1(module=nodenext).types
@@ -457,88 +457,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
@@ -901,88 +901,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // cjs format file
 const x = 1;
@@ -1344,88 +1344,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=node16).types b/tests/baselines/reference/nodeModulesAllowJs1(module=node16).types
index 5ccb7ac4988..672e1a9c81b 100644
--- a/tests/baselines/reference/nodeModulesAllowJs1(module=node16).types
+++ b/tests/baselines/reference/nodeModulesAllowJs1(module=node16).types
@@ -457,88 +457,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
@@ -901,88 +901,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // cjs format file
 const x = 1;
@@ -1344,88 +1344,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).types b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).types
index 5ccb7ac4988..672e1a9c81b 100644
--- a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).types
@@ -457,88 +457,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
@@ -901,88 +901,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // cjs format file
 const x = 1;
@@ -1344,88 +1344,88 @@ const _m35 = import("./");
 >     : ^^^^^^^^^^^^
 >import("./") : Promise<any>
 >             : ^^^^^^^^^^^^
->"./" : string
->     : ^^^^^^
+>"./" : "./"
+>     : ^^^^
 
 const _m36 = import("./index");
 >_m36 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./index") : Promise<any>
 >                  : ^^^^^^^^^^^^
->"./index" : string
->          : ^^^^^^
+>"./index" : "./index"
+>          : ^^^^^^^^^
 
 const _m37 = import("./subfolder");
 >_m37 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder") : Promise<any>
 >                      : ^^^^^^^^^^^^
->"./subfolder" : string
->              : ^^^^^^
+>"./subfolder" : "./subfolder"
+>              : ^^^^^^^^^^^^^
 
 const _m38 = import("./subfolder/");
 >_m38 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder/" : string
->               : ^^^^^^
+>"./subfolder/" : "./subfolder/"
+>               : ^^^^^^^^^^^^^^
 
 const _m39 = import("./subfolder/index");
 >_m39 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder/index") : Promise<any>
 >                            : ^^^^^^^^^^^^
->"./subfolder/index" : string
->                    : ^^^^^^
+>"./subfolder/index" : "./subfolder/index"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 const _m40 = import("./subfolder2");
 >_m40 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2") : Promise<any>
 >                       : ^^^^^^^^^^^^
->"./subfolder2" : string
->               : ^^^^^^
+>"./subfolder2" : "./subfolder2"
+>               : ^^^^^^^^^^^^^^
 
 const _m41 = import("./subfolder2/");
 >_m41 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/") : Promise<any>
 >                        : ^^^^^^^^^^^^
->"./subfolder2/" : string
->                : ^^^^^^
+>"./subfolder2/" : "./subfolder2/"
+>                : ^^^^^^^^^^^^^^^
 
 const _m42 = import("./subfolder2/index");
 >_m42 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/index") : Promise<any>
 >                             : ^^^^^^^^^^^^
->"./subfolder2/index" : string
->                     : ^^^^^^
+>"./subfolder2/index" : "./subfolder2/index"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 const _m43 = import("./subfolder2/another");
 >_m43 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another") : Promise<any>
 >                               : ^^^^^^^^^^^^
->"./subfolder2/another" : string
->                       : ^^^^^^
+>"./subfolder2/another" : "./subfolder2/another"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 const _m44 = import("./subfolder2/another/");
 >_m44 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/") : Promise<any>
 >                                : ^^^^^^^^^^^^
->"./subfolder2/another/" : string
->                        : ^^^^^^
+>"./subfolder2/another/" : "./subfolder2/another/"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 const _m45 = import("./subfolder2/another/index");
 >_m45 : Promise<any>
 >     : ^^^^^^^^^^^^
 >import("./subfolder2/another/index") : Promise<any>
 >                                     : ^^^^^^^^^^^^
->"./subfolder2/another/index" : string
->                             : ^^^^^^
+>"./subfolder2/another/index" : "./subfolder2/another/index"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 // esm format file
 const x = 1;
diff --git a/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=node16).types b/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=node16).types
index cc33312ad00..8689b18a720 100644
--- a/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=node16).types
+++ b/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=node16).types
@@ -12,8 +12,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === index.js ===
 // esm format file
@@ -27,8 +27,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === types.d.ts ===
 declare module "fs";
diff --git a/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=nodenext).types b/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=nodenext).types
index cc33312ad00..8689b18a720 100644
--- a/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=nodenext).types
@@ -12,8 +12,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === index.js ===
 // esm format file
@@ -27,8 +27,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === types.d.ts ===
 declare module "fs";
diff --git a/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=node16).types b/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=node16).types
index b174eb7641c..e10d1bf1c83 100644
--- a/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=node16).types
+++ b/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=node16).types
@@ -31,8 +31,8 @@ export async function f() {
 >                             : ^^^^^^^^^^
 >import ("../index.js") : Promise<typeof mod>
 >                       : ^^^^^^^^^^^^^^^^^^^
->"../index.js" : string
->              : ^^^^^^
+>"../index.js" : "../index.js"
+>              : ^^^^^^^^^^^^^
 
     const mod4 = await import ("./index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -41,8 +41,8 @@ export async function f() {
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     h();
 >h() : Promise<void>
@@ -81,8 +81,8 @@ export async function h() {
 >                            : ^^^^^^^^^^
 >import ("./index.js") : Promise<typeof mod>
 >                      : ^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     const mod4 = await import ("./subfolder/index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -91,8 +91,8 @@ export async function h() {
 >                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./subfolder/index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./subfolder/index.js" : string
->                       : ^^^^^^
+>"./subfolder/index.js" : "./subfolder/index.js"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
     f();
 >f() : Promise<void>
diff --git a/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).types b/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).types
index b174eb7641c..e10d1bf1c83 100644
--- a/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).types
@@ -31,8 +31,8 @@ export async function f() {
 >                             : ^^^^^^^^^^
 >import ("../index.js") : Promise<typeof mod>
 >                       : ^^^^^^^^^^^^^^^^^^^
->"../index.js" : string
->              : ^^^^^^
+>"../index.js" : "../index.js"
+>              : ^^^^^^^^^^^^^
 
     const mod4 = await import ("./index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -41,8 +41,8 @@ export async function f() {
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     h();
 >h() : Promise<void>
@@ -81,8 +81,8 @@ export async function h() {
 >                            : ^^^^^^^^^^
 >import ("./index.js") : Promise<typeof mod>
 >                      : ^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     const mod4 = await import ("./subfolder/index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -91,8 +91,8 @@ export async function h() {
 >                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./subfolder/index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./subfolder/index.js" : string
->                       : ^^^^^^
+>"./subfolder/index.js" : "./subfolder/index.js"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
     f();
 >f() : Promise<void>
diff --git a/tests/baselines/reference/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types b/tests/baselines/reference/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types
index f7c9c074bd4..6d8dcb3cc5c 100644
--- a/tests/baselines/reference/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types
+++ b/tests/baselines/reference/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types
@@ -21,8 +21,8 @@ export const a = await import("package/cjs");
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("package/cjs") : Promise<{ default: typeof import("index"); }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package/cjs" : string
->              : ^^^^^^
+>"package/cjs" : "package/cjs"
+>              : ^^^^^^^^^^^^^
 
 export const b = await import("package/mjs");
 >b : typeof import("index")
@@ -31,8 +31,8 @@ export const b = await import("package/mjs");
 >                            : ^^^^^^^^^^^^^^^^^^^^^^
 >import("package/mjs") : Promise<typeof import("index")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package/mjs" : string
->              : ^^^^^^
+>"package/mjs" : "package/mjs"
+>              : ^^^^^^^^^^^^^
 
 export const c = await import("package");
 >c : typeof import("index")
@@ -41,8 +41,8 @@ export const c = await import("package");
 >                        : ^^^^^^^^^^^^^^^^^^^^^^
 >import("package") : Promise<typeof import("index")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package" : string
->          : ^^^^^^
+>"package" : "package"
+>          : ^^^^^^^^^
 
 export const f = await import("inner");
 >f : { default: typeof import("node_modules/inner/index"); cjsMain: true; }
@@ -51,8 +51,8 @@ export const f = await import("inner");
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<{ default: typeof import("node_modules/inner/index"); cjsMain: true; }>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 
 === other2.ts ===
 // esm format file
@@ -63,8 +63,8 @@ export const d = await import("inner/cjs");
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/cjs") : Promise<{ default: typeof import("node_modules/inner/index"); cjsNonmain: true; }>
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/cjs" : string
->            : ^^^^^^
+>"inner/cjs" : "inner/cjs"
+>            : ^^^^^^^^^^^
 
 export const e = await import("inner/mjs");
 >e : typeof import("node_modules/inner/index")
@@ -73,8 +73,8 @@ export const e = await import("inner/mjs");
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/mjs" : string
->            : ^^^^^^
+>"inner/mjs" : "inner/mjs"
+>            : ^^^^^^^^^^^
 
 === other.mts ===
 // esm format file
@@ -85,8 +85,8 @@ export const a = await import("package/cjs");
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("package/cjs") : Promise<{ default: typeof import("index"); }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package/cjs" : string
->              : ^^^^^^
+>"package/cjs" : "package/cjs"
+>              : ^^^^^^^^^^^^^
 
 export const b = await import("package/mjs");
 >b : typeof import("index")
@@ -95,8 +95,8 @@ export const b = await import("package/mjs");
 >                            : ^^^^^^^^^^^^^^^^^^^^^^
 >import("package/mjs") : Promise<typeof import("index")>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package/mjs" : string
->              : ^^^^^^
+>"package/mjs" : "package/mjs"
+>              : ^^^^^^^^^^^^^
 
 export const c = await import("package");
 >c : typeof import("index")
@@ -105,8 +105,8 @@ export const c = await import("package");
 >                        : ^^^^^^^^^^^^^^^^^^^^^^
 >import("package") : Promise<typeof import("index")>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package" : string
->          : ^^^^^^
+>"package" : "package"
+>          : ^^^^^^^^^
 
 export const f = await import("inner");
 >f : { default: typeof import("node_modules/inner/index"); cjsMain: true; }
@@ -115,8 +115,8 @@ export const f = await import("inner");
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<{ default: typeof import("node_modules/inner/index"); cjsMain: true; }>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 
 === other2.mts ===
 // esm format file
@@ -127,8 +127,8 @@ export const d = await import("inner/cjs");
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/cjs") : Promise<{ default: typeof import("node_modules/inner/index"); cjsNonmain: true; }>
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/cjs" : string
->            : ^^^^^^
+>"inner/cjs" : "inner/cjs"
+>            : ^^^^^^^^^^^
 
 export const e = await import("inner/mjs");
 >e : typeof import("node_modules/inner/index")
@@ -137,8 +137,8 @@ export const e = await import("inner/mjs");
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/mjs" : string
->            : ^^^^^^
+>"inner/mjs" : "inner/mjs"
+>            : ^^^^^^^^^^^
 
 === other.cts ===
 // cjs format file, no TLA
@@ -147,32 +147,32 @@ export const a = import("package/cjs");
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("package/cjs") : Promise<{ default: typeof import("index"); }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package/cjs" : string
->              : ^^^^^^
+>"package/cjs" : "package/cjs"
+>              : ^^^^^^^^^^^^^
 
 export const b = import("package/mjs");
 >b : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("package/mjs") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package/mjs" : string
->              : ^^^^^^
+>"package/mjs" : "package/mjs"
+>              : ^^^^^^^^^^^^^
 
 export const c = import("package");
 >c : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("package") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"package" : string
->          : ^^^^^^
+>"package" : "package"
+>          : ^^^^^^^^^
 
 export const f = import("inner");
 >f : Promise<{ default: typeof import("node_modules/inner/index"); cjsMain: true; }>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<{ default: typeof import("node_modules/inner/index"); cjsMain: true; }>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 
 === other2.cts ===
 // cjs format file, no TLA
@@ -181,16 +181,16 @@ export const d = import("inner/cjs");
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/cjs") : Promise<{ default: typeof import("node_modules/inner/index"); cjsNonmain: true; }>
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/cjs" : string
->            : ^^^^^^
+>"inner/cjs" : "inner/cjs"
+>            : ^^^^^^^^^^^
 
 export const e = import("inner/mjs");
 >e : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/mjs") : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/mjs" : string
->            : ^^^^^^
+>"inner/mjs" : "inner/mjs"
+>            : ^^^^^^^^^^^
 
 === node_modules/inner/index.d.ts ===
 // cjs format file
diff --git a/tests/baselines/reference/nodeModulesDynamicImport(module=node16).types b/tests/baselines/reference/nodeModulesDynamicImport(module=node16).types
index 6b3ca8bd7fe..18249dadabb 100644
--- a/tests/baselines/reference/nodeModulesDynamicImport(module=node16).types
+++ b/tests/baselines/reference/nodeModulesDynamicImport(module=node16).types
@@ -12,8 +12,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === index.ts ===
 // esm format file
@@ -27,8 +27,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === types.d.ts ===
 declare module "fs";
diff --git a/tests/baselines/reference/nodeModulesDynamicImport(module=nodenext).types b/tests/baselines/reference/nodeModulesDynamicImport(module=nodenext).types
index 6b3ca8bd7fe..18249dadabb 100644
--- a/tests/baselines/reference/nodeModulesDynamicImport(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesDynamicImport(module=nodenext).types
@@ -12,8 +12,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === index.ts ===
 // esm format file
@@ -27,8 +27,8 @@ export async function main() {
 >await import("fs") : any
 >import("fs") : Promise<any>
 >             : ^^^^^^^^^^^^
->"fs" : string
->     : ^^^^^^
+>"fs" : "fs"
+>     : ^^^^
 }
 === types.d.ts ===
 declare module "fs";
diff --git a/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node16).types b/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node16).types
index 5e19bde1a73..dc944e2b96a 100644
--- a/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node16).types
+++ b/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node16).types
@@ -19,8 +19,8 @@ export const a = (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types b/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
index 5e19bde1a73..dc944e2b96a 100644
--- a/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
@@ -19,8 +19,8 @@ export const a = (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSourceTs(module=node16).types b/tests/baselines/reference/nodeModulesExportsSourceTs(module=node16).types
index c896aea6667..880b84aad2d 100644
--- a/tests/baselines/reference/nodeModulesExportsSourceTs(module=node16).types
+++ b/tests/baselines/reference/nodeModulesExportsSourceTs(module=node16).types
@@ -19,8 +19,8 @@ export const a = (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSourceTs(module=nodenext).types b/tests/baselines/reference/nodeModulesExportsSourceTs(module=nodenext).types
index c896aea6667..880b84aad2d 100644
--- a/tests/baselines/reference/nodeModulesExportsSourceTs(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesExportsSourceTs(module=nodenext).types
@@ -19,8 +19,8 @@ export const a = (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=node16).types b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=node16).types
index b57102a2c75..d62dfd1155d 100644
--- a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=node16).types
+++ b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=node16).types
@@ -19,8 +19,8 @@ export const a = (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
index b57102a2c75..d62dfd1155d 100644
--- a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
@@ -19,8 +19,8 @@ export const a = (await import("inner")).x();
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner") : Promise<typeof import("node_modules/inner/index")>
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner" : string
->        : ^^^^^^
+>"inner" : "inner"
+>        : ^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
index 2289065fab0..034994f0ff8 100644
--- a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
+++ b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
@@ -19,8 +19,8 @@ export const a = (await import("inner/index.js")).x();
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/index.js" : string
->                 : ^^^^^^
+>"inner/index.js" : "inner/index.js"
+>                 : ^^^^^^^^^^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
index 2289065fab0..034994f0ff8 100644
--- a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
@@ -19,8 +19,8 @@ export const a = (await import("inner/index.js")).x();
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/index.js" : string
->                 : ^^^^^^
+>"inner/index.js" : "inner/index.js"
+>                 : ^^^^^^^^^^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=node16).types b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=node16).types
index 6872a9097ca..78367ad6e97 100644
--- a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=node16).types
+++ b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=node16).types
@@ -19,8 +19,8 @@ export const a = (await import("inner/index.js")).x();
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/index.js" : string
->                 : ^^^^^^
+>"inner/index.js" : "inner/index.js"
+>                 : ^^^^^^^^^^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
index 6872a9097ca..78367ad6e97 100644
--- a/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
@@ -19,8 +19,8 @@ export const a = (await import("inner/index.js")).x();
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"inner/index.js" : string
->                 : ^^^^^^
+>"inner/index.js" : "inner/index.js"
+>                 : ^^^^^^^^^^^^^^^^
 >x : () => import("node_modules/inner/other").Thing
 >  : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
 
diff --git a/tests/baselines/reference/nodeModulesImportAssertions(module=node16).types b/tests/baselines/reference/nodeModulesImportAssertions(module=node16).types
index 2c6dda95b2e..9780c35bba0 100644
--- a/tests/baselines/reference/nodeModulesImportAssertions(module=node16).types
+++ b/tests/baselines/reference/nodeModulesImportAssertions(module=node16).types
@@ -19,8 +19,8 @@ const json2 = import("./package.json", { assert: { type: "json" } }); // should
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./package.json", { assert: { type: "json" } }) : Promise<{ default: { name: string; private: boolean; type: string; }; }>
 >                                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./package.json" : string
->                 : ^^^^^^
+>"./package.json" : "./package.json"
+>                 : ^^^^^^^^^^^^^^^^
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -29,7 +29,7 @@ const json2 = import("./package.json", { assert: { type: "json" } }); // should
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 === package.json ===
diff --git a/tests/baselines/reference/nodeModulesImportAssertions(module=nodenext).types b/tests/baselines/reference/nodeModulesImportAssertions(module=nodenext).types
index 2c6dda95b2e..9780c35bba0 100644
--- a/tests/baselines/reference/nodeModulesImportAssertions(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesImportAssertions(module=nodenext).types
@@ -19,8 +19,8 @@ const json2 = import("./package.json", { assert: { type: "json" } }); // should
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./package.json", { assert: { type: "json" } }) : Promise<{ default: { name: string; private: boolean; type: string; }; }>
 >                                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./package.json" : string
->                 : ^^^^^^
+>"./package.json" : "./package.json"
+>                 : ^^^^^^^^^^^^^^^^
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { type: string; }
@@ -29,7 +29,7 @@ const json2 = import("./package.json", { assert: { type: "json" } }); // should
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 === package.json ===
diff --git a/tests/baselines/reference/nodeModulesImportAttributes(module=node16).types b/tests/baselines/reference/nodeModulesImportAttributes(module=node16).types
index a24dd0825a8..6f07805d83b 100644
--- a/tests/baselines/reference/nodeModulesImportAttributes(module=node16).types
+++ b/tests/baselines/reference/nodeModulesImportAttributes(module=node16).types
@@ -19,8 +19,8 @@ const json2 = import("./package.json", { with: { type: "json" } }); // should be
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./package.json", { with: { type: "json" } }) : Promise<{ default: { name: string; private: boolean; type: string; }; }>
 >                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./package.json" : string
->                 : ^^^^^^
+>"./package.json" : "./package.json"
+>                 : ^^^^^^^^^^^^^^^^
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -29,7 +29,7 @@ const json2 = import("./package.json", { with: { type: "json" } }); // should be
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 === package.json ===
diff --git a/tests/baselines/reference/nodeModulesImportAttributes(module=nodenext).types b/tests/baselines/reference/nodeModulesImportAttributes(module=nodenext).types
index a24dd0825a8..6f07805d83b 100644
--- a/tests/baselines/reference/nodeModulesImportAttributes(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesImportAttributes(module=nodenext).types
@@ -19,8 +19,8 @@ const json2 = import("./package.json", { with: { type: "json" } }); // should be
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("./package.json", { with: { type: "json" } }) : Promise<{ default: { name: string; private: boolean; type: string; }; }>
 >                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./package.json" : string
->                 : ^^^^^^
+>"./package.json" : "./package.json"
+>                 : ^^^^^^^^^^^^^^^^
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { type: string; }
@@ -29,7 +29,7 @@ const json2 = import("./package.json", { with: { type: "json" } }); // should be
 >                 : ^^^^^^^^^^^^^^^^^
 >type : string
 >     : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
 === package.json ===
diff --git a/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types b/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
index 6aa12a60963..c1e5b7e23e6 100644
--- a/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
+++ b/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
@@ -57,8 +57,8 @@ export type LocalInterface =
 >                                                             : ^^^
 >import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"resolution-mode" : string
@@ -148,8 +148,8 @@ export type LocalInterface =
 >                                                                 : ^^^
 >import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -228,8 +228,8 @@ export type LocalInterface =
 >                                          : ^^^
 >import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >Attribute2 : any
 >           : ^^^
 >ImportInterface : any
diff --git a/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types b/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
index 6aa12a60963..c1e5b7e23e6 100644
--- a/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
@@ -57,8 +57,8 @@ export type LocalInterface =
 >                                                             : ^^^
 >import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"resolution-mode" : string
@@ -148,8 +148,8 @@ export type LocalInterface =
 >                                                                 : ^^^
 >import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -228,8 +228,8 @@ export type LocalInterface =
 >                                          : ^^^
 >import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >Attribute2 : any
 >           : ^^^
 >ImportInterface : any
diff --git a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
index 6111b6f9251..a38ebca6a3f 100644
--- a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
+++ b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
@@ -55,8 +55,8 @@ export type LocalInterface =
 >                                                             : ^^^
 >import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"resolution-mode" : string
@@ -146,8 +146,8 @@ export type LocalInterface =
 >                                                                 : ^^^
 >import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -226,8 +226,8 @@ export type LocalInterface =
 >                                        : ^^^
 >import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >Asserts2 : any
 >         : ^^^
 >ImportInterface : any
diff --git a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
index 6111b6f9251..a38ebca6a3f 100644
--- a/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
@@ -55,8 +55,8 @@ export type LocalInterface =
 >                                                             : ^^^
 >import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"resolution-mode" : string
@@ -146,8 +146,8 @@ export type LocalInterface =
 >                                                                 : ^^^
 >import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -226,8 +226,8 @@ export type LocalInterface =
 >                                        : ^^^
 >import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >Asserts2 : any
 >         : ^^^
 >ImportInterface : any
diff --git a/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=node16).types b/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=node16).types
index 1813aceaa22..508587cdb1a 100644
--- a/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=node16).types
+++ b/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=node16).types
@@ -31,8 +31,8 @@ export async function f() {
 >                             : ^^^^^^^^^^
 >import ("../index.js") : Promise<typeof mod>
 >                       : ^^^^^^^^^^^^^^^^^^^
->"../index.js" : string
->              : ^^^^^^
+>"../index.js" : "../index.js"
+>              : ^^^^^^^^^^^^^
 
     const mod4 = await import ("./index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -41,8 +41,8 @@ export async function f() {
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     h();
 >h() : Promise<void>
@@ -81,8 +81,8 @@ export async function h() {
 >                            : ^^^^^^^^^^
 >import ("./index.js") : Promise<typeof mod>
 >                      : ^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     const mod4 = await import ("./subfolder/index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -91,8 +91,8 @@ export async function h() {
 >                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./subfolder/index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./subfolder/index.js" : string
->                       : ^^^^^^
+>"./subfolder/index.js" : "./subfolder/index.js"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
     f();
 >f() : Promise<void>
diff --git a/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=nodenext).types b/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=nodenext).types
index 1813aceaa22..508587cdb1a 100644
--- a/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=nodenext).types
+++ b/tests/baselines/reference/nodeModulesSynchronousCallErrors(module=nodenext).types
@@ -31,8 +31,8 @@ export async function f() {
 >                             : ^^^^^^^^^^
 >import ("../index.js") : Promise<typeof mod>
 >                       : ^^^^^^^^^^^^^^^^^^^
->"../index.js" : string
->              : ^^^^^^
+>"../index.js" : "../index.js"
+>              : ^^^^^^^^^^^^^
 
     const mod4 = await import ("./index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -41,8 +41,8 @@ export async function f() {
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     h();
 >h() : Promise<void>
@@ -81,8 +81,8 @@ export async function h() {
 >                            : ^^^^^^^^^^
 >import ("./index.js") : Promise<typeof mod>
 >                      : ^^^^^^^^^^^^^^^^^^^
->"./index.js" : string
->             : ^^^^^^
+>"./index.js" : "./index.js"
+>             : ^^^^^^^^^^^^
 
     const mod4 = await import ("./subfolder/index.js");
 >mod4 : { default: typeof mod2; f(): Promise<void>; }
@@ -91,8 +91,8 @@ export async function h() {
 >                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import ("./subfolder/index.js") : Promise<{ default: typeof mod2; f(): Promise<void>; }>
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./subfolder/index.js" : string
->                       : ^^^^^^
+>"./subfolder/index.js" : "./subfolder/index.js"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
     f();
 >f() : Promise<void>
diff --git a/tests/baselines/reference/nodeNextCjsNamespaceImportDefault1.types b/tests/baselines/reference/nodeNextCjsNamespaceImportDefault1.types
index def591a5d14..4c4414a58b2 100644
--- a/tests/baselines/reference/nodeNextCjsNamespaceImportDefault1.types
+++ b/tests/baselines/reference/nodeNextCjsNamespaceImportDefault1.types
@@ -4,8 +4,8 @@
 export const a: number = 1;
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 === src/foo.mts ===
 import d, {a} from './a.cjs';
diff --git a/tests/baselines/reference/nodeNextCjsNamespaceImportDefault2.types b/tests/baselines/reference/nodeNextCjsNamespaceImportDefault2.types
index 012d079bee3..6db99b8ceea 100644
--- a/tests/baselines/reference/nodeNextCjsNamespaceImportDefault2.types
+++ b/tests/baselines/reference/nodeNextCjsNamespaceImportDefault2.types
@@ -4,8 +4,8 @@
 export const a: number = 1;
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 export default 'string';
 === src/foo.mts ===
diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types
index 406992d351a..640e6f374cd 100644
--- a/tests/baselines/reference/nonInstantiatedModule.types
+++ b/tests/baselines/reference/nonInstantiatedModule.types
@@ -76,12 +76,12 @@ module M2 {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
     }
 
diff --git a/tests/baselines/reference/nonIterableRestElement1.types b/tests/baselines/reference/nonIterableRestElement1.types
index 5b1f00c404c..a61f11663f8 100644
--- a/tests/baselines/reference/nonIterableRestElement1.types
+++ b/tests/baselines/reference/nonIterableRestElement1.types
@@ -17,8 +17,8 @@ var c = {};
 >  : ^^
 >["", 0] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/nonIterableRestElement2.types b/tests/baselines/reference/nonIterableRestElement2.types
index 603d9ddfef7..cc68e7aee79 100644
--- a/tests/baselines/reference/nonIterableRestElement2.types
+++ b/tests/baselines/reference/nonIterableRestElement2.types
@@ -17,8 +17,8 @@ var c = {};
 >  : ^^
 >["", 0] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/nonIterableRestElement3.types b/tests/baselines/reference/nonIterableRestElement3.types
index 3ef10edb06f..9db4a0a4311 100644
--- a/tests/baselines/reference/nonIterableRestElement3.types
+++ b/tests/baselines/reference/nonIterableRestElement3.types
@@ -22,8 +22,8 @@ var c = { bogus: 0 };
 >  : ^^^^^^^^^^^^^^^^^^
 >["", 0] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/nonNullableReduction.types b/tests/baselines/reference/nonNullableReduction.types
index 9bff68c7002..7828b314cdb 100644
--- a/tests/baselines/reference/nonNullableReduction.types
+++ b/tests/baselines/reference/nonNullableReduction.types
@@ -30,16 +30,16 @@ function test<T>(f1: Transform1<T>, f2: Transform2<T>) {
 >              : ^^^^^^^^^^^^^
 >f1 : ((value: string) => T) | undefined
 >   : ^^     ^^      ^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     f2?.("hello");
 >f2?.("hello") : T | undefined
 >              : ^^^^^^^^^^^^^
 >f2 : ((value: string) => T) | ((value: string) => T) | undefined
 >   : ^^     ^^      ^^^^^^^^^^^^     ^^      ^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 function f1<T>(x: T | (string extends T ? null | undefined : never)) {
diff --git a/tests/baselines/reference/nonNullableReductionNonStrict.types b/tests/baselines/reference/nonNullableReductionNonStrict.types
index ce7672ddd07..a46bcbc3fb7 100644
--- a/tests/baselines/reference/nonNullableReductionNonStrict.types
+++ b/tests/baselines/reference/nonNullableReductionNonStrict.types
@@ -30,16 +30,16 @@ function test<T>(f1: Transform1<T>, f2: Transform2<T>) {
 >              : ^
 >f1 : (value: string) => T
 >   : ^     ^^      ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     f2?.("hello");
 >f2?.("hello") : T
 >              : ^
 >f2 : ((value: string) => T) | ((value: string) => T)
 >   : ^^     ^^      ^^^^^^^^^^^^     ^^      ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 function f1<T>(x: T | (string extends T ? null | undefined : never)) {
diff --git a/tests/baselines/reference/nonObjectUnionNestedExcessPropertyCheck.types b/tests/baselines/reference/nonObjectUnionNestedExcessPropertyCheck.types
index e1f29e5d923..dc33fb8867e 100644
--- a/tests/baselines/reference/nonObjectUnionNestedExcessPropertyCheck.types
+++ b/tests/baselines/reference/nonObjectUnionNestedExcessPropertyCheck.types
@@ -34,7 +34,7 @@ const propB1: IProps | number = { INVALID_PROP_NAME: 'share', iconProp: 'test' }
 >        : ^^^^^^^
 >iconProp : string
 >         : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 // Nested typing works here and we also get an expected error:
@@ -53,7 +53,7 @@ const propB2: IProps | number = { nestedProp: { asdfasdf: 'test' }, iconProp: 't
 >       : ^^^^^^
 >iconProp : string
 >         : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 // Want an error generated here but there isn't one.
@@ -72,6 +72,6 @@ const propA1: INestedProps | number = { nestedProps: { INVALID_PROP_NAME: 'share
 >        : ^^^^^^^
 >iconProp : string
 >         : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/nonPrimitiveUnionIntersection.types b/tests/baselines/reference/nonPrimitiveUnionIntersection.types
index fee0ec67eb9..977132a9f1e 100644
--- a/tests/baselines/reference/nonPrimitiveUnionIntersection.types
+++ b/tests/baselines/reference/nonPrimitiveUnionIntersection.types
@@ -4,8 +4,8 @@
 var a: object & string = ""; // error
 >a : never
 >  : ^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var b: object | string = ""; // ok
 >b : string | object
diff --git a/tests/baselines/reference/nonnullAssertionPropegatesContextualType.types b/tests/baselines/reference/nonnullAssertionPropegatesContextualType.types
index 02df3632bd3..8424e057fb0 100644
--- a/tests/baselines/reference/nonnullAssertionPropegatesContextualType.types
+++ b/tests/baselines/reference/nonnullAssertionPropegatesContextualType.types
@@ -17,6 +17,6 @@ let rect2: SVGRectElement = document.querySelector('.svg-rectangle')!; // Error:
 >         : ^^^^^^^^
 >querySelector : { <K extends keyof HTMLElementTagNameMap>(selectors: K): HTMLElementTagNameMap[K] | null; <K extends keyof SVGElementTagNameMap>(selectors: K): SVGElementTagNameMap[K] | null; <K extends keyof MathMLElementTagNameMap>(selectors: K): MathMLElementTagNameMap[K] | null; <K extends keyof HTMLElementDeprecatedTagNameMap>(selectors: K): HTMLElementDeprecatedTagNameMap[K] | null; <E extends Element = Element>(selectors: string): E | null; }
 >              : ^^^ ^^^^^^^^^                           ^^         ^^ ^^^                               ^^^ ^^^^^^^^^                          ^^         ^^ ^^^                              ^^^ ^^^^^^^^^                             ^^         ^^ ^^^                                 ^^^ ^^^^^^^^^                                     ^^         ^^ ^^^                                         ^^^ ^^^^^^^^^       ^^^^^^^^^^^^         ^^      ^^^        ^^^
->'.svg-rectangle' : string
->                 : ^^^^^^
+>'.svg-rectangle' : ".svg-rectangle"
+>                 : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/normalizedIntersectionTooComplex.types b/tests/baselines/reference/normalizedIntersectionTooComplex.types
index 366dc0a1c60..75f6433313e 100644
--- a/tests/baselines/reference/normalizedIntersectionTooComplex.types
+++ b/tests/baselines/reference/normalizedIntersectionTooComplex.types
@@ -242,8 +242,8 @@ const comp = ctor({ common: "ok", ref: x => console.log(x) });
 >                                           : ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
 >common : string
 >       : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 >ref : (x: any) => void
 >    : ^ ^^^^^^^^^^^^^^
 >x => console.log(x) : (x: any) => void
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
index 631e6c06eeb..8887c02ac6e 100644
--- a/tests/baselines/reference/null.types
+++ b/tests/baselines/reference/null.types
@@ -65,8 +65,8 @@ var w:I={x:null,y:3};
 >  : ^^^^
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 
 
diff --git a/tests/baselines/reference/nullOrUndefinedTypeGuardIsOrderIndependent.types b/tests/baselines/reference/nullOrUndefinedTypeGuardIsOrderIndependent.types
index aa270450605..02612dd1de1 100644
--- a/tests/baselines/reference/nullOrUndefinedTypeGuardIsOrderIndependent.types
+++ b/tests/baselines/reference/nullOrUndefinedTypeGuardIsOrderIndependent.types
@@ -12,8 +12,8 @@ function test(strOrNull: string | null, strOrUndefined: string | undefined) {
     var str: string = "original";
 >str : string
 >    : ^^^^^^
->"original" : string
->           : ^^^^^^
+>"original" : "original"
+>           : ^^^^^^^^^^
 
     var nil: null;
 >nil : null
diff --git a/tests/baselines/reference/nullishCoalescingOperator1.types b/tests/baselines/reference/nullishCoalescingOperator1.types
index f94a241587a..d6e8d07a6a8 100644
--- a/tests/baselines/reference/nullishCoalescingOperator1.types
+++ b/tests/baselines/reference/nullishCoalescingOperator1.types
@@ -76,8 +76,8 @@ const aa1 = a1 ?? 'whatever';
 >                 : ^^^^^^
 >a1 : string | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa2 = a2 ?? 'whatever';
 >aa2 : string
@@ -86,8 +86,8 @@ const aa2 = a2 ?? 'whatever';
 >                 : ^^^^^^
 >a2 : string | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa3 = a3 ?? 'whatever';
 >aa3 : string
@@ -96,8 +96,8 @@ const aa3 = a3 ?? 'whatever';
 >                 : ^^^^^^
 >a3 : string | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa4 = a4 ?? 'whatever';
 >aa4 : string
@@ -106,8 +106,8 @@ const aa4 = a4 ?? 'whatever';
 >                 : ^^^^^^
 >a4 : string | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const bb1 = b1 ?? 1;
 >bb1 : number
@@ -116,8 +116,8 @@ const bb1 = b1 ?? 1;
 >        : ^^^^^^
 >b1 : number | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const bb2 = b2 ?? 1;
 >bb2 : number
@@ -126,8 +126,8 @@ const bb2 = b2 ?? 1;
 >        : ^^^^^^
 >b2 : number | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const bb3 = b3 ?? 1;
 >bb3 : number
@@ -136,8 +136,8 @@ const bb3 = b3 ?? 1;
 >        : ^^^^^^
 >b3 : number | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const bb4 = b4 ?? 1;
 >bb4 : number
@@ -146,8 +146,8 @@ const bb4 = b4 ?? 1;
 >        : ^^^^^^
 >b4 : number | null | undefined
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const cc1 = c1 ?? true;
 >cc1 : boolean
diff --git a/tests/baselines/reference/nullishCoalescingOperator10.types b/tests/baselines/reference/nullishCoalescingOperator10.types
index cc35692ea31..1bd2da8ebfb 100644
--- a/tests/baselines/reference/nullishCoalescingOperator10.types
+++ b/tests/baselines/reference/nullishCoalescingOperator10.types
@@ -14,7 +14,7 @@ let gg = f() ?? 'foo'
 >    : ^^^^^^^^^^^^^^^^^^
 >f : () => string | undefined
 >  : ^^^^^^                  
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 
diff --git a/tests/baselines/reference/nullishCoalescingOperator2.types b/tests/baselines/reference/nullishCoalescingOperator2.types
index b34b1f91681..9607bcf07dd 100644
--- a/tests/baselines/reference/nullishCoalescingOperator2.types
+++ b/tests/baselines/reference/nullishCoalescingOperator2.types
@@ -108,18 +108,18 @@ const aa7 = a7 ?? 'whatever'
 >                 : ^^
 >a7 : unknown
 >   : ^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa8 = a8 ?? 'whatever'
->aa8 : string
->    : ^^^^^^
->a8 ?? 'whatever' : string
->                 : ^^^^^^
+>aa8 : "whatever"
+>    : ^^^^^^^^^^
+>a8 ?? 'whatever' : "whatever"
+>                 : ^^^^^^^^^^
 >a8 : null
 >   : ^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa9 = a9 ?? 'whatever'
 >aa9 : any
diff --git a/tests/baselines/reference/nullishCoalescingOperator6.types b/tests/baselines/reference/nullishCoalescingOperator6.types
index 82b40d67d37..e9ae9a6f904 100644
--- a/tests/baselines/reference/nullishCoalescingOperator6.types
+++ b/tests/baselines/reference/nullishCoalescingOperator6.types
@@ -12,6 +12,6 @@ function foo(foo: string, bar = foo ?? "bar") { }
 >             : ^^^^^^
 >foo : string
 >    : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/nullishCoalescingOperator7.types b/tests/baselines/reference/nullishCoalescingOperator7.types
index c525d1f5453..c5b3eb4eff6 100644
--- a/tests/baselines/reference/nullishCoalescingOperator7.types
+++ b/tests/baselines/reference/nullishCoalescingOperator7.types
@@ -34,8 +34,8 @@ const foo2 = a ?? 'foo' ? 1 : 2;
 >           : ^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 >1 : 1
 >  : ^
 >2 : 2
@@ -50,24 +50,24 @@ const foo3 = a ?? 'foo' ? (b ?? 'bar') : (c ?? 'baz');
 >           : ^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 >(b ?? 'bar') : string
 >             : ^^^^^^
 >b ?? 'bar' : string
 >           : ^^^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 >(c ?? 'baz') : string
 >             : ^^^^^^
 >c ?? 'baz' : string
 >           : ^^^^^^
 >c : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'baz' : string
->      : ^^^^^^
+>'baz' : "baz"
+>      : ^^^^^
 
 function f () {
 >f : () => void
@@ -82,19 +82,19 @@ function f () {
 >           : ^^^^^^
 >a : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 >b ?? 'bar' : string
 >           : ^^^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 >c ?? 'baz' : string
 >           : ^^^^^^
 >c : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'baz' : string
->      : ^^^^^^
+>'baz' : "baz"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/nullishCoalescingOperator8.types b/tests/baselines/reference/nullishCoalescingOperator8.types
index 50b2a7b4607..df6f3e201d7 100644
--- a/tests/baselines/reference/nullishCoalescingOperator8.types
+++ b/tests/baselines/reference/nullishCoalescingOperator8.types
@@ -28,8 +28,8 @@ const n1 = a.p ?? "default";
 >  : ^^^^^                  ^^^^^^^                  ^^^
 >p : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"default" : string
->          : ^^^^^^
+>"default" : "default"
+>          : ^^^^^^^^^
 
 const n2 = a.m() ?? "default";
 >n2 : string
@@ -44,8 +44,8 @@ const n2 = a.m() ?? "default";
 >  : ^^^^^                  ^^^^^^^                  ^^^
 >m : () => string | undefined
 >  : ^^^^^^                  
->"default" : string
->          : ^^^^^^
+>"default" : "default"
+>          : ^^^^^^^^^
 
 const n3 = a.m() ?? b.p ?? b.m() ?? "default";;
 >n3 : string
@@ -78,6 +78,6 @@ const n3 = a.m() ?? b.p ?? b.m() ?? "default";;
 >  : ^^^^^                  ^^^^^^^                  ^^^
 >m : () => string | undefined
 >  : ^^^^^^                  
->"default" : string
->          : ^^^^^^
+>"default" : "default"
+>          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/nullishCoalescingOperator_es2020.types b/tests/baselines/reference/nullishCoalescingOperator_es2020.types
index 3d0c00e6662..b6d79f37be1 100644
--- a/tests/baselines/reference/nullishCoalescingOperator_es2020.types
+++ b/tests/baselines/reference/nullishCoalescingOperator_es2020.types
@@ -108,18 +108,18 @@ const aa7 = a7 ?? 'whatever'
 >                 : ^^
 >a7 : unknown
 >   : ^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa8 = a8 ?? 'whatever'
->aa8 : string
->    : ^^^^^^
->a8 ?? 'whatever' : string
->                 : ^^^^^^
+>aa8 : "whatever"
+>    : ^^^^^^^^^^
+>a8 ?? 'whatever' : "whatever"
+>                 : ^^^^^^^^^^
 >a8 : null
 >   : ^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa9 = a9 ?? 'whatever'
 >aa9 : any
diff --git a/tests/baselines/reference/nullishCoalescingOperator_not_strict.types b/tests/baselines/reference/nullishCoalescingOperator_not_strict.types
index aef4ea4da0d..c24ff1b0e50 100644
--- a/tests/baselines/reference/nullishCoalescingOperator_not_strict.types
+++ b/tests/baselines/reference/nullishCoalescingOperator_not_strict.types
@@ -108,18 +108,18 @@ const aa7 = a7 ?? 'whatever'
 >                 : ^^^^^^^
 >a7 : unknown
 >   : ^^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa8 = a8 ?? 'whatever'
->aa8 : string
->    : ^^^^^^
->a8 ?? 'whatever' : string
->                 : ^^^^^^
+>aa8 : "whatever"
+>    : ^^^^^^^^^^
+>a8 ?? 'whatever' : "whatever"
+>                 : ^^^^^^^^^^
 >a8 : null
 >   : ^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 const aa9 = a9 ?? 'whatever'
 >aa9 : any
diff --git a/tests/baselines/reference/numberToString.types b/tests/baselines/reference/numberToString.types
index 053de47614c..56e372eb93b 100644
--- a/tests/baselines/reference/numberToString.types
+++ b/tests/baselines/reference/numberToString.types
@@ -24,16 +24,16 @@ f1(3);
 >      : ^^^^^^
 >f1 : (n: number) => string
 >   : ^ ^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 f2(3); // error no coercion to string
 >f2(3) : void
 >      : ^^^^
 >f2 : (s: string) => void
 >   : ^ ^^      ^^^^^    
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 f2(3+""); // ok + operator promotes
 >f2(3+"") : void
diff --git a/tests/baselines/reference/numberVsBigIntOperations.types b/tests/baselines/reference/numberVsBigIntOperations.types
index e92f6e84d4d..1d54ea84037 100644
--- a/tests/baselines/reference/numberVsBigIntOperations.types
+++ b/tests/baselines/reference/numberVsBigIntOperations.types
@@ -13,30 +13,30 @@ let bigInt = 1n, num = 2;
 >  : ^
 
 bigInt = 1n; bigInt = 2; num = 1n; num = 2;
->bigInt = 1n : bigint
->            : ^^^^^^
+>bigInt = 1n : 1n
+>            : ^^
 >bigInt : bigint
 >       : ^^^^^^
->1n : bigint
->   : ^^^^^^
->bigInt = 2 : number
->           : ^^^^^^
+>1n : 1n
+>   : ^^
+>bigInt = 2 : 2
+>           : ^
 >bigInt : bigint
 >       : ^^^^^^
->2 : number
->  : ^^^^^^
->num = 1n : bigint
->         : ^^^^^^
+>2 : 2
+>  : ^
+>num = 1n : 1n
+>         : ^^
 >num : number
 >    : ^^^^^^
->1n : bigint
->   : ^^^^^^
->num = 2 : number
->        : ^^^^^^
+>1n : 1n
+>   : ^^
+>num = 2 : 2
+>        : ^
 >num : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 bigInt += 1n; bigInt += 2; num += 1n; num += 2;
 >bigInt += 1n : bigint
diff --git a/tests/baselines/reference/numericEnumMappedType.types b/tests/baselines/reference/numericEnumMappedType.types
index af88e2ab9c6..7ede3b7c455 100644
--- a/tests/baselines/reference/numericEnumMappedType.types
+++ b/tests/baselines/reference/numericEnumMappedType.types
@@ -64,52 +64,52 @@ const e2: E2 = E2.ONE;
 >    : ^^^^^^
 
 b1[1] = "a";
->b1[1] = "a" : string
->            : ^^^^^^
+>b1[1] = "a" : "a"
+>            : ^^^
 >b1[1] : string | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >b1 : Bins1
 >   : ^^^^^
 >1 : 1
 >  : ^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 b1[e1] = "b";
->b1[e1] = "b" : string
->             : ^^^^^^
+>b1[e1] = "b" : "b"
+>             : ^^^
 >b1[e1] : string | undefined
 >       : ^^^^^^^^^^^^^^^^^^
 >b1 : Bins1
 >   : ^^^^^
 >e1 : E1.ONE
 >   : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 b2[1] = "a";
->b2[1] = "a" : string
->            : ^^^^^^
+>b2[1] = "a" : "a"
+>            : ^^^
 >b2[1] : string | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >b2 : Bins2
 >   : ^^^^^
 >1 : 1
 >  : ^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 b2[e2] = "b";
->b2[e2] = "b" : string
->             : ^^^^^^
+>b2[e2] = "b" : "b"
+>             : ^^^
 >b2[e2] : string | undefined
 >       : ^^^^^^^^^^^^^^^^^^
 >b2 : Bins2
 >   : ^^^^^
 >e2 : E2.ONE
 >   : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 // Multiple numeric enum types accrue to the same numeric index signature in a mapped type
 
diff --git a/tests/baselines/reference/numericIndexExpressions.types b/tests/baselines/reference/numericIndexExpressions.types
index 2f0bc082e69..d92366b24ec 100644
--- a/tests/baselines/reference/numericIndexExpressions.types
+++ b/tests/baselines/reference/numericIndexExpressions.types
@@ -18,54 +18,54 @@ var x: Numbers1;
 >  : ^^^^^^^^
 
 x[1] = 4; // error
->x[1] = 4 : number
->         : ^^^^^^
+>x[1] = 4 : 4
+>         : ^
 >x[1] : string
 >     : ^^^^^^
 >x : Numbers1
 >  : ^^^^^^^^
 >1 : 1
 >  : ^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 x['1'] = 4; // error
->x['1'] = 4 : number
->           : ^^^^^^
+>x['1'] = 4 : 4
+>           : ^
 >x['1'] : string
 >       : ^^^^^^
 >x : Numbers1
 >  : ^^^^^^^^
 >'1' : "1"
 >    : ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var y: Strings1;
 >y : Strings1
 >  : ^^^^^^^^
 
 y['1'] = 4; // should be error
->y['1'] = 4 : number
->           : ^^^^^^
+>y['1'] = 4 : 4
+>           : ^
 >y['1'] : string
 >       : ^^^^^^
 >y : Strings1
 >  : ^^^^^^^^
 >'1' : "1"
 >    : ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 y[1] = 4; // should be error
->y[1] = 4 : number
->         : ^^^^^^
+>y[1] = 4 : 4
+>         : ^
 >y[1] : string
 >     : ^^^^^^
 >y : Strings1
 >  : ^^^^^^^^
 >1 : 1
 >  : ^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
index f08b41709d5..b1f10f66370 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
@@ -2,7 +2,7 @@ numericIndexerConstrainsPropertyDeclarations.ts(18,5): error TS2411: Property '2
 numericIndexerConstrainsPropertyDeclarations.ts(21,5): error TS2411: Property '3.0' of type 'MyNumber' is not assignable to 'number' index type 'string'.
 numericIndexerConstrainsPropertyDeclarations.ts(50,5): error TS2411: Property '2.0' of type 'number' is not assignable to 'number' index type 'string'.
 numericIndexerConstrainsPropertyDeclarations.ts(68,5): error TS2411: Property '2.0' of type 'number' is not assignable to 'number' index type 'string'.
-numericIndexerConstrainsPropertyDeclarations.ts(79,5): error TS2353: Object literal may only specify known properties, and 'a' does not exist in type '{ [x: number]: string; }'.
+numericIndexerConstrainsPropertyDeclarations.ts(85,5): error TS2322: Type 'number' is not assignable to type 'string'.
 numericIndexerConstrainsPropertyDeclarations.ts(88,9): error TS2304: Cannot find name 'Myn'.
 
 
@@ -94,14 +94,15 @@ numericIndexerConstrainsPropertyDeclarations.ts(88,9): error TS2304: Cannot find
     // error
     var b: { [x: number]: string; } = {
         a: '',
-        ~
-!!! error TS2353: Object literal may only specify known properties, and 'a' does not exist in type '{ [x: number]: string; }'.
         b: 1, 
         c: () => { }, 
         "d": '', 
         "e": 1, 
         1.0: '',
         2.0: 1, 
+        ~~~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6501 numericIndexerConstrainsPropertyDeclarations.ts:78:10: The expected type comes from this index signature.
         "3.0": '', 
         "4.0": 1, 
         f: <Myn>null, 
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
index b84fcd3ad0a..207ce7288e2 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
@@ -259,14 +259,14 @@ var b: { [x: number]: string; } = {
     1.0: '',
 >1.0 : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     2.0: 1, 
 >2.0 : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     "3.0": '', 
 >"3.0" : string
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
index 3daa55150c5..5a701d5f858 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
@@ -10,8 +10,8 @@ class A {
     foo(): string { return ''; }
 >foo : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class B extends A {
@@ -23,8 +23,8 @@ class B extends A {
     bar(): string { return ''; }
 >bar : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class Foo {
diff --git a/tests/baselines/reference/numericIndexingResults.types b/tests/baselines/reference/numericIndexingResults.types
index 1fcbeb46de7..5d0c4aba4a5 100644
--- a/tests/baselines/reference/numericIndexingResults.types
+++ b/tests/baselines/reference/numericIndexingResults.types
@@ -250,12 +250,12 @@ var b: { [x: number]: string } = { 1: '', "2": '' }
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >1 : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >"2" : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r1a = b['1'];
 >r1a : string
@@ -330,12 +330,12 @@ var b2: { [x: number]: string; 1: string; "2": string; } = { 1: '', "2": '' }
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >1 : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >"2" : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r1b = b2['1'];
 >r1b : string
diff --git a/tests/baselines/reference/numericLiteralTypes1.types b/tests/baselines/reference/numericLiteralTypes1.types
index 1f42115f595..33f88ca37b2 100644
--- a/tests/baselines/reference/numericLiteralTypes1.types
+++ b/tests/baselines/reference/numericLiteralTypes1.types
@@ -372,8 +372,8 @@ function f5(a: 1, b: 0 | 1 | 2) {
 >     : ^^^^^^
 >g : { (x: 0): string; (x: 1): boolean; (x: number): number; }
 >  : ^^^ ^^ ^^^      ^^^ ^^ ^^^       ^^^ ^^      ^^^      ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     var z4 = g(a);
 >z4 : boolean
@@ -407,8 +407,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 type Tag = 0 | 1 | 2;
diff --git a/tests/baselines/reference/numericLiteralTypes2.types b/tests/baselines/reference/numericLiteralTypes2.types
index b5bedeb1f93..126d8471c2b 100644
--- a/tests/baselines/reference/numericLiteralTypes2.types
+++ b/tests/baselines/reference/numericLiteralTypes2.types
@@ -372,8 +372,8 @@ function f5(a: 1, b: 0 | 1 | 2) {
 >     : ^^^^^^
 >g : { (x: 0): string; (x: 1): boolean; (x: number): number; }
 >  : ^^^ ^^ ^^^      ^^^ ^^ ^^^       ^^^ ^^      ^^^      ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     var z4 = g(a);
 >z4 : boolean
@@ -407,8 +407,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 type Tag = 0 | 1 | 2;
diff --git a/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.types b/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.types
index 5a1308e173e..80664c96927 100644
--- a/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.types
+++ b/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.types
@@ -45,8 +45,8 @@
 var i: number = 1;
 >i : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var test1 = i.toString();
 >test1 : string
diff --git a/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints02.types b/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints02.types
index 75e75877088..3e60cfed28f 100644
--- a/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints02.types
+++ b/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints02.types
@@ -45,8 +45,8 @@
 var i: number = 1;
 >i : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var test1 = i.toString();
 >test1 : string
diff --git a/tests/baselines/reference/numericStringLiteralTypes.types b/tests/baselines/reference/numericStringLiteralTypes.types
index b50a8a7e000..813b84df4a8 100644
--- a/tests/baselines/reference/numericStringLiteralTypes.types
+++ b/tests/baselines/reference/numericStringLiteralTypes.types
@@ -111,8 +111,8 @@ const container1 = createContainer('hi')
 >                      : ^^^^^^^^^^^^^^^^^
 >createContainer : <T extends unknown>(value: T) => Container<T>
 >                : ^ ^^^^^^^^^       ^^     ^^ ^^^^^            
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
 const container2 = createContainer(2)
 >container2 : Container<number>
@@ -121,8 +121,8 @@ const container2 = createContainer(2)
 >                   : ^^^^^^^^^^^^^^^^^
 >createContainer : <T extends unknown>(value: T) => Container<T>
 >                : ^ ^^^^^^^^^       ^^     ^^ ^^^^^            
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 f([container1, container2], (value1, value2) => {
 >f([container1, container2], (value1, value2) => {    value1;  // string    value2;  // number}) : void
diff --git a/tests/baselines/reference/objectAssignLikeNonUnionResult.types b/tests/baselines/reference/objectAssignLikeNonUnionResult.types
index 817b7b5b32d..5ff307a4874 100644
--- a/tests/baselines/reference/objectAssignLikeNonUnionResult.types
+++ b/tests/baselines/reference/objectAssignLikeNonUnionResult.types
@@ -13,8 +13,8 @@ const defaultValue: Interface = { field: 1 };
 >             : ^^^^^^^^^^^^^^^^^^
 >field : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 declare function assign<T, U>(target: T, source: U): T & U;
 >assign : <T, U>(target: T, source: U) => T & U
@@ -53,8 +53,8 @@ const data1 = assign(defaultValue, Date.now() > 3 ? { field: 2 } : {});
 >             : ^^^^^^^^^^^^^^^^^^
 >field : number
 >      : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >{} : {}
 >   : ^^
 
diff --git a/tests/baselines/reference/objectCreationExpressionInFunctionParameter.types b/tests/baselines/reference/objectCreationExpressionInFunctionParameter.types
index fd7cdebbe93..4bb587817e0 100644
--- a/tests/baselines/reference/objectCreationExpressionInFunctionParameter.types
+++ b/tests/baselines/reference/objectCreationExpressionInFunctionParameter.types
@@ -19,7 +19,7 @@ function foo(x = new A(123)) { //should error, 123 is not string
 >           : ^
 >A : typeof A
 >  : ^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 }}
diff --git a/tests/baselines/reference/objectCreationOfElementAccessExpression.types b/tests/baselines/reference/objectCreationOfElementAccessExpression.types
index 394cd81ec25..b850cdf25eb 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.types
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.types
@@ -14,16 +14,16 @@ class Food {
 >     : ^^^^^^
 
         this.amount = 100;
->this.amount = 100 : number
->                  : ^^^^^^
+>this.amount = 100 : 100
+>                  : ^^^
 >this.amount : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >amount : number
 >       : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
     }
     public eat(amountToEat: number): boolean {
 >eat : (amountToEat: number) => boolean
@@ -56,16 +56,16 @@ class Food {
 >  : ^
 
             this.amount = 0;
->this.amount = 0 : number
->                : ^^^^^^
+>this.amount = 0 : 0
+>                : ^
 >this.amount : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >amount : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
             return false;
 >false : false
@@ -118,8 +118,8 @@ class IceCream extends MonsterFood {
 >                           : ^^^^
 >super : typeof MonsterFood
 >      : ^^^^^^^^^^^^^^^^^^
->"Ice Cream" : string
->            : ^^^^^^
+>"Ice Cream" : "Ice Cream"
+>            : ^^^^^^^^^^^
 >flavor : string
 >       : ^^^^^^
     }
@@ -141,8 +141,8 @@ class Cookie extends MonsterFood {
 >                        : ^^^^
 >super : typeof MonsterFood
 >      : ^^^^^^^^^^^^^^^^^^
->"Cookie" : string
->         : ^^^^^^
+>"Cookie" : "Cookie"
+>         : ^^^^^^^^
 >flavor : string
 >       : ^^^^^^
     }
@@ -183,8 +183,8 @@ class ExpensiveOrganicDogFood extends PetFood {
 >                            : ^^^^
 >super : typeof PetFood
 >      : ^^^^^^^^^^^^^^
->"Origen" : string
->         : ^^^^^^
+>"Origen" : "Origen"
+>         : ^^^^^^^^
 >whereToBuy : number
 >           : ^^^^^^
     }
@@ -206,8 +206,8 @@ class ExpensiveOrganicCatFood extends PetFood {
 >                                    : ^^^^
 >super : typeof PetFood
 >      : ^^^^^^^^^^^^^^
->"Nature's Logic" : string
->                 : ^^^^^^
+>"Nature's Logic" : "Nature's Logic"
+>                 : ^^^^^^^^^^^^^^^^
 >whereToBuy : number
 >           : ^^^^^^
     }
@@ -237,8 +237,8 @@ var foods = new PetFood[new IceCream('Mint chocolate chip') , Cookie('Chocolate
 >                                    : ^^^^^^^^
 >IceCream : typeof IceCream
 >         : ^^^^^^^^^^^^^^^
->'Mint chocolate chip' : string
->                      : ^^^^^^
+>'Mint chocolate chip' : "Mint chocolate chip"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 >Cookie('Chocolate chip', false) : any
 >                                : ^^^
 >Cookie : typeof Cookie
@@ -251,8 +251,8 @@ var foods = new PetFood[new IceCream('Mint chocolate chip') , Cookie('Chocolate
 >                                  : ^^^^^^
 >Cookie : typeof Cookie
 >       : ^^^^^^^^^^^^^
->'Peanut butter' : string
->                : ^^^^^^
+>'Peanut butter' : "Peanut butter"
+>                : ^^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -273,8 +273,8 @@ var foods2: MonsterFood[] = new PetFood[new IceCream('Mint chocolate chip') , Co
 >                                    : ^^^^^^^^
 >IceCream : typeof IceCream
 >         : ^^^^^^^^^^^^^^^
->'Mint chocolate chip' : string
->                      : ^^^^^^
+>'Mint chocolate chip' : "Mint chocolate chip"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 >Cookie('Chocolate chip', false) : any
 >                                : ^^^
 >Cookie : typeof Cookie
@@ -287,8 +287,8 @@ var foods2: MonsterFood[] = new PetFood[new IceCream('Mint chocolate chip') , Co
 >                                  : ^^^^^^
 >Cookie : typeof Cookie
 >       : ^^^^^^^^^^^^^
->'Peanut butter' : string
->                : ^^^^^^
+>'Peanut butter' : "Peanut butter"
+>                : ^^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/objectFreeze.types b/tests/baselines/reference/objectFreeze.types
index f431fa58cf1..1f9e672b867 100644
--- a/tests/baselines/reference/objectFreeze.types
+++ b/tests/baselines/reference/objectFreeze.types
@@ -30,10 +30,10 @@ f(1, "") === false;
 >         : ^^^^^
 >f : (a: number, b: string) => false
 >  : ^ ^^      ^^ ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>"" : ""
+>   : ^^
 >false : false
 >      : ^^^^^
 
@@ -62,8 +62,8 @@ new c(1);
 >         : ^
 >c : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const a = Object.freeze([1, 2, 3]);
 >a : readonly number[]
@@ -78,12 +78,12 @@ const a = Object.freeze([1, 2, 3]);
 >       : ^^^ ^^^^^^^^^        ^^ ^^ ^^^ ^^^ ^^^^^^^^^                                                 ^^ ^^^^^^^^^                                           ^^ ^^ ^^^           ^^^ ^^ ^^ ^^^           ^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 a[0] = a[2].toString();
 >a[0] = a[2].toString() : string
diff --git a/tests/baselines/reference/objectFromEntries.types b/tests/baselines/reference/objectFromEntries.types
index 06548c8d0ed..8baa6681b60 100644
--- a/tests/baselines/reference/objectFromEntries.types
+++ b/tests/baselines/reference/objectFromEntries.types
@@ -18,20 +18,20 @@ const o = Object.fromEntries([['a', 1], ['b', 2], ['c', 3]]);
 >         : ^^^^^^^^^^^^^^^^
 >'a' : "a"
 >    : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >['b', 2] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
 >'b' : "b"
 >    : ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >['c', 3] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
 >'c' : "c"
 >    : ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 const o2 = Object.fromEntries(new URLSearchParams());
 >o2 : { [k: string]: string; }
@@ -72,10 +72,10 @@ const o3 = Object.fromEntries(new Map([[Symbol("key"), "value"]]));
 >              : ^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->"key" : string
->      : ^^^^^^
->"value" : string
->        : ^^^^^^
+>"key" : "key"
+>      : ^^^^^
+>"value" : "value"
+>        : ^^^^^^^
 
 const frozenArray = Object.freeze([['a', 1], ['b', 2], ['c', 3]]);
 >frozenArray : readonly (string | number)[][]
@@ -92,22 +92,22 @@ const frozenArray = Object.freeze([['a', 1], ['b', 2], ['c', 3]]);
 >                               : ^^^^^^^^^^^^^^^^^^^^^
 >['a', 1] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>1 : 1
+>  : ^
 >['b', 2] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
->2 : number
->  : ^^^^^^
+>'b' : "b"
+>    : ^^^
+>2 : 2
+>  : ^
 >['c', 3] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->'c' : string
->    : ^^^^^^
->3 : number
->  : ^^^^^^
+>'c' : "c"
+>    : ^^^
+>3 : 3
+>  : ^
 
 const o4 = Object.fromEntries(frozenArray);
 >o4 : any
@@ -136,22 +136,22 @@ const frozenArray2: readonly [string, number][] = Object.freeze([['a', 1], ['b',
 >                               : ^^^^^^^^^^^^^^^^^^
 >['a', 1] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>1 : 1
+>  : ^
 >['b', 2] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'b' : string
->    : ^^^^^^
->2 : number
->  : ^^^^^^
+>'b' : "b"
+>    : ^^^
+>2 : 2
+>  : ^
 >['c', 3] : [string, number]
 >         : ^^^^^^^^^^^^^^^^
->'c' : string
->    : ^^^^^^
->3 : number
->  : ^^^^^^
+>'c' : "c"
+>    : ^^^
+>3 : 3
+>  : ^
 
 const o5 = Object.fromEntries(frozenArray2);
 >o5 : { [k: string]: number; }
diff --git a/tests/baselines/reference/objectGroupBy.types b/tests/baselines/reference/objectGroupBy.types
index 0dadb10bd3b..ec9a37f131b 100644
--- a/tests/baselines/reference/objectGroupBy.types
+++ b/tests/baselines/reference/objectGroupBy.types
@@ -14,12 +14,12 @@ const basic = Object.groupBy([0, 2, 8], x => x < 5 ? 'small' : 'large');
 >        : ^ ^^^^^^^^^           ^^ ^^     ^^           ^^           ^^                             ^^^^^                       
 >[0, 2, 8] : number[]
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->8 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>2 : 2
+>  : ^
+>8 : 8
+>  : ^
 >x => x < 5 ? 'small' : 'large' : (x: number) => "small" | "large"
 >                               : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.types b/tests/baselines/reference/objectLitArrayDeclNoNew.types
index b410946f381..2a6acf522a4 100644
--- a/tests/baselines/reference/objectLitArrayDeclNoNew.types
+++ b/tests/baselines/reference/objectLitArrayDeclNoNew.types
@@ -36,8 +36,8 @@ module Test {
         public moo: number = 0;
 >moo : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     export function bug(): ILineTokens {
diff --git a/tests/baselines/reference/objectLitGetterSetter.types b/tests/baselines/reference/objectLitGetterSetter.types
index c9ad2e7aa85..180cef7e06e 100644
--- a/tests/baselines/reference/objectLitGetterSetter.types
+++ b/tests/baselines/reference/objectLitGetterSetter.types
@@ -37,8 +37,8 @@
 >eval("public = 1;") : any
 >eval : (x: string) => any
 >     : ^ ^^      ^^^^^   
->"public = 1;" : string
->              : ^^^^^^
+>"public = 1;" : "public = 1;"
+>              : ^^^^^^^^^^^^^
 
                     return 11;
 >11 : 11
diff --git a/tests/baselines/reference/objectLitTargetTypeCallSite.types b/tests/baselines/reference/objectLitTargetTypeCallSite.types
index eb7006c86e9..a9f3c8a2861 100644
--- a/tests/baselines/reference/objectLitTargetTypeCallSite.types
+++ b/tests/baselines/reference/objectLitTargetTypeCallSite.types
@@ -33,6 +33,6 @@ process({a:true,b:"y"});
 >     : ^^^^
 >b : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 
diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.types b/tests/baselines/reference/objectLiteralArraySpecialization.types
index 72f81f2cd14..f9d6305eaa7 100644
--- a/tests/baselines/reference/objectLiteralArraySpecialization.types
+++ b/tests/baselines/reference/objectLiteralArraySpecialization.types
@@ -37,22 +37,22 @@ var thing = create([ { name: "bob", id: 24 }, { name: "doug", id: 32 } ]); // sh
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"bob" : string
->      : ^^^^^^
+>"bob" : "bob"
+>      : ^^^^^
 >id : number
 >   : ^^^^^^
->24 : number
->   : ^^^^^^
+>24 : 24
+>   : ^^
 >{ name: "doug", id: 32 } : { name: string; id: number; }
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"doug" : string
+>"doug" : "doug"
 >       : ^^^^^^
 >id : number
 >   : ^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
 thing.doSomething((x, y) => x.name === "bob"); // should not error
 >thing.doSomething((x, y) => x.name === "bob") : void
diff --git a/tests/baselines/reference/objectLiteralContextualTyping.types b/tests/baselines/reference/objectLiteralContextualTyping.types
index 6d3e21f1d89..510d639e401 100644
--- a/tests/baselines/reference/objectLiteralContextualTyping.types
+++ b/tests/baselines/reference/objectLiteralContextualTyping.types
@@ -39,8 +39,8 @@ var x = foo({ name: "Sprocket" });
 >                     : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Sprocket" : string
->           : ^^^^^^
+>"Sprocket" : "Sprocket"
+>           : ^^^^^^^^^^
 
 var x: string;
 >x : string
@@ -57,12 +57,12 @@ var y = foo({ name: "Sprocket", description: "Bumpy wheel" });
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Sprocket" : string
->           : ^^^^^^
+>"Sprocket" : "Sprocket"
+>           : ^^^^^^^^^^
 >description : string
 >            : ^^^^^^
->"Bumpy wheel" : string
->              : ^^^^^^
+>"Bumpy wheel" : "Bumpy wheel"
+>              : ^^^^^^^^^^^^^
 
 var y: string;
 >y : string
diff --git a/tests/baselines/reference/objectLiteralEnumPropertyNames.types b/tests/baselines/reference/objectLiteralEnumPropertyNames.types
index a325269ad28..cf31c451778 100644
--- a/tests/baselines/reference/objectLiteralEnumPropertyNames.types
+++ b/tests/baselines/reference/objectLiteralEnumPropertyNames.types
@@ -37,8 +37,8 @@ const x: TestStrs = {
 >     : ^^^^^^^^^^^
 >A : Strs.A
 >  : ^^^^^^
->'xo' : string
->     : ^^^^^^
+>'xo' : "xo"
+>     : ^^^^
 
     [Strs.B]: 'xe'
 >[Strs.B] : string
@@ -49,8 +49,8 @@ const x: TestStrs = {
 >     : ^^^^^^^^^^^
 >B : Strs.B
 >  : ^^^^^^
->'xe' : string
->     : ^^^^^^
+>'xe' : "xe"
+>     : ^^^^
 }
 const ux = {
 >ux : { a: string; b: string; }
@@ -93,16 +93,16 @@ const y: TestStrs = {
 >      : ^^^^^^
 >'a' : "a"
 >    : ^^^
->'yo' : string
->     : ^^^^^^
+>'yo' : "yo"
+>     : ^^^^
 
     ['b']: 'ye'
 >['b'] : string
 >      : ^^^^^^
 >'b' : "b"
 >    : ^^^
->'ye' : string
->     : ^^^^^^
+>'ye' : "ye"
+>     : ^^^^
 }
 const a = 'a';
 >a : "a"
@@ -127,16 +127,16 @@ const z: TestStrs = {
 >    : ^^^^^^
 >a : "a"
 >  : ^^^
->'zo' : string
->     : ^^^^^^
+>'zo' : "zo"
+>     : ^^^^
 
     [b]: 'ze'
 >[b] : string
 >    : ^^^^^^
 >b : "b"
 >  : ^^^
->'ze' : string
->     : ^^^^^^
+>'ze' : "ze"
+>     : ^^^^
 }
 const uz = {
 >uz : { a: string; b: string; }
@@ -196,8 +196,8 @@ const n: TestNums = {
 >     : ^^^^^^^^^^^
 >A : Nums.A
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     [Nums.B]: 2
 >[Nums.B] : number
@@ -208,8 +208,8 @@ const n: TestNums = {
 >     : ^^^^^^^^^^^
 >B : Nums.B
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 const un = {
 >un : { 0: number; 1: number; }
@@ -264,16 +264,16 @@ const m: TestNums = {
 >     : ^^^^^^
 >an : 0
 >   : ^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
     [bn]: 6
 >[bn] : number
 >     : ^^^^^^
 >bn : 1
 >   : ^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 }
 const um = {
 >um : { 0: number; 1: number; }
diff --git a/tests/baselines/reference/objectLiteralErrors.types b/tests/baselines/reference/objectLiteralErrors.types
index 7c678158d8d..69cf423a7f9 100644
--- a/tests/baselines/reference/objectLiteralErrors.types
+++ b/tests/baselines/reference/objectLiteralErrors.types
@@ -523,8 +523,8 @@ var g1 = { get a(): number { return 4; }, set a(n: string) { } };
 >                                                        : ^^^^^^^^^^^      ^^^^^^^^ ^^      ^^^^
 >a : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >a : number
 >  : ^^^^^^
 >n : string
@@ -537,8 +537,8 @@ var g2 = { get a() { return 4; }, set a(n: string) { } };
 >                                                : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >a : string
 >  : ^^^^^^
 >n : string
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.types b/tests/baselines/reference/objectLiteralExcessProperties.types
index a6b6e3a412c..c47665c97fa 100644
--- a/tests/baselines/reference/objectLiteralExcessProperties.types
+++ b/tests/baselines/reference/objectLiteralExcessProperties.types
@@ -42,8 +42,8 @@ var b3: Book | (Book[]) = [{ foreword: "hello" }, { forwards: "back" }];
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >foreword : string
 >         : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >{ forwards: "back" } : { forwards: string; }
 >                     : ^^^^^^^^^^^^^^^^^^^^^
 >forwards : string
@@ -58,8 +58,8 @@ var b4: Book & Cover = { foreword: "hi", colour: "blue" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foreword : string
 >         : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 >colour : string
 >       : ^^^^^^
 >"blue" : "blue"
@@ -76,7 +76,7 @@ var b5: Book & Cover = { foreward: "hi", color: "blue" };
 >     : ^^^^
 >color : string
 >      : ^^^^^^
->"blue" : string
+>"blue" : "blue"
 >       : ^^^^^^
 
 var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
@@ -86,11 +86,11 @@ var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foreword : string
 >         : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 >color : string
 >      : ^^^^^^
->"blue" : string
+>"blue" : "blue"
 >       : ^^^^^^
 >price : number
 >      : ^^^^^^
@@ -104,8 +104,8 @@ var b7: Book & number = { foreword: "hi", price: 10.99 };
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foreword : string
 >         : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 >price : number
 >      : ^^^^^^
 >10.99 : 10.99
@@ -228,7 +228,7 @@ function test<T extends IFoo>() {
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 >prop : boolean
 >     : ^^^^^^^
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types
index a5b87f05bd2..5e36cee80ca 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types
@@ -40,8 +40,8 @@ f2({ value: '' }) // missing toString satisfied by Object's member
 >              : ^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 f2({ value: '', what: 1 }) // missing toString satisfied by Object's member
 >f2({ value: '', what: 1 }) : void
@@ -52,8 +52,8 @@ f2({ value: '', what: 1 }) // missing toString satisfied by Object's member
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >what : number
 >     : ^^^^^^
 >1 : 1
@@ -100,8 +100,8 @@ f2({ value: '', toString: (s) => s.uhhh }) // error
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >toString : (s: string) => any
 >         : ^ ^^^^^^^^^^^^^^^^
 >(s) => s.uhhh : (s: string) => any
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types
index 5aa6fd166d5..28891133bc3 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types
@@ -40,8 +40,8 @@ f2({ value: '' })
 >              : ^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 f2({ value: '', what: 1 }) 
 >f2({ value: '', what: 1 }) : void
@@ -52,8 +52,8 @@ f2({ value: '', what: 1 })
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >what : number
 >     : ^^^^^^
 >1 : 1
@@ -100,8 +100,8 @@ f2({ value: '', toString: (s) => s.uhhh })
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >toString : (s: any) => any
 >         : ^ ^^^^^^^^^^^^^
 >(s) => s.uhhh : (s: any) => any
diff --git a/tests/baselines/reference/objectLiteralNormalization.types b/tests/baselines/reference/objectLiteralNormalization.types
index de1a54023e7..5905535a8a2 100644
--- a/tests/baselines/reference/objectLiteralNormalization.types
+++ b/tests/baselines/reference/objectLiteralNormalization.types
@@ -75,8 +75,8 @@ a1 = { a: 1 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 a1 = { a: 0, b: 0 };  // Error
 >a1 = { a: 0, b: 0 } : { a: number; b: number; }
@@ -87,12 +87,12 @@ a1 = { a: 0, b: 0 };  // Error
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 a1 = { b: "y" };  // Error
 >a1 = { b: "y" } : { b: string; }
@@ -103,8 +103,8 @@ a1 = { b: "y" };  // Error
 >           : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 
 a1 = { c: true };  // Error
 >a1 = { c: true } : { c: true; }
@@ -171,12 +171,12 @@ a2 = { a: 10, b: 20 };
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 a2 = { a: "def" };
 >a2 = { a: "def" } : { a: string; }
@@ -187,8 +187,8 @@ a2 = { a: "def" };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"def" : string
->      : ^^^^^^
+>"def" : "def"
+>      : ^^^^^
 
 a2 = {};
 >a2 = {} : {}
@@ -207,12 +207,12 @@ a2 = { a: "def", b: 20 };  // Error
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"def" : string
->      : ^^^^^^
+>"def" : "def"
+>      : ^^^^^
 >b : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 a2 = { a: 1 };  // Error
 >a2 = { a: 1 } : { a: number; }
@@ -223,8 +223,8 @@ a2 = { a: 1 };  // Error
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Object literals containing spreads are not normalized
 declare let b1: { a: string, b: string } | { b: string, c: string };
@@ -492,18 +492,18 @@ let e1 = f({ a: 1, b: 2 }, { a: "abc" }, {});
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >{ a: "abc" } : { a: string; }
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 >{} : {}
 >   : ^^
 
@@ -520,18 +520,18 @@ let e2 = f({}, { a: "abc" }, { a: 1, b: 2 });
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 >{ a: 1, b: 2 } : { a: number; b: number; }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 let e3 = f(data, { a: 2 });
 >e3 : { a: 1; b: "abc"; c: true; }
diff --git a/tests/baselines/reference/objectLiteralParameterResolution.types b/tests/baselines/reference/objectLiteralParameterResolution.types
index ca21c9d6645..94fbcfdc343 100644
--- a/tests/baselines/reference/objectLiteralParameterResolution.types
+++ b/tests/baselines/reference/objectLiteralParameterResolution.types
@@ -41,13 +41,13 @@ var s = $.extend({
     type: "GET" ,
 >type : string
 >     : ^^^^^^
->"GET" : string
->      : ^^^^^^
+>"GET" : "GET"
+>      : ^^^^^
 
     data: "data" ,
 >data : string
 >     : ^^^^^^
->"data" : string
+>"data" : "data"
 >       : ^^^^^^
 
     success: wrapSuccessCallback(requestContext, callback) ,
@@ -77,7 +77,7 @@ var s = $.extend({
     dataType: "json" ,
 >dataType : string
 >         : ^^^^^^
->"json" : string
+>"json" : "json"
 >       : ^^^^^^
 
     converters: { "text json": "" },
@@ -87,8 +87,8 @@ var s = $.extend({
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^
 >"text json" : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     traditional: true ,
 >traditional : true
@@ -99,8 +99,8 @@ var s = $.extend({
     timeout: 12,
 >timeout : number
 >        : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     }, "");
 >"" : ""
diff --git a/tests/baselines/reference/objectLiteralPropertyImplicitlyAny.types b/tests/baselines/reference/objectLiteralPropertyImplicitlyAny.types
index 81eeb8890de..9850daf6e94 100644
--- a/tests/baselines/reference/objectLiteralPropertyImplicitlyAny.types
+++ b/tests/baselines/reference/objectLiteralPropertyImplicitlyAny.types
@@ -12,8 +12,8 @@ const foo = Symbol.for("foo");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 const o = { [foo]: undefined };
 >o : { [foo]: any; }
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.types b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.types
index aeb60e7ea2c..c79a544f1d9 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.types
@@ -4,14 +4,14 @@
 var id: number = 10000;
 >id : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 
 var name: string = "my name";
 >name : string
 >     : ^^^^^^
->"my name" : string
->          : ^^^^^^
+>"my name" : "my name"
+>          : ^^^^^^^^^
 
 var person: { name: string; id: number } = { name, id };
 >person : { name: string; id: number; }
@@ -94,10 +94,10 @@ var person1 = bar("Hello", 5);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : (name: string, id: number) => { name: string; id: number; }
 >    : ^    ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
 var person2: { name: string } = bar("Hello", 5);
 >person2 : { name: string; }
@@ -108,10 +108,10 @@ var person2: { name: string } = bar("Hello", 5);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : (name: string, id: number) => { name: string; id: number; }
 >    : ^    ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
 var person3: { name: string; id:number } = bar("Hello", 5);
 >person3 : { name: string; id: number; }
@@ -124,8 +124,8 @@ var person3: { name: string; id:number } = bar("Hello", 5);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : (name: string, id: number) => { name: string; id: number; }
 >    : ^    ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.types b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.types
index 830b49a9ad3..5fd6f717c80 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.types
@@ -4,14 +4,14 @@
 var id: number = 10000;
 >id : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 
 var name: string = "my name";
 >name : string
 >     : ^^^^^^
->"my name" : string
->          : ^^^^^^
+>"my name" : "my name"
+>          : ^^^^^^^^^
 
 var person: { name: string; id: number } = { name, id };
 >person : { name: string; id: number; }
@@ -94,10 +94,10 @@ var person1 = bar("Hello", 5);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : (name: string, id: number) => { name: string; id: number; }
 >    : ^    ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
 var person2: { name: string } = bar("Hello", 5);
 >person2 : { name: string; }
@@ -108,10 +108,10 @@ var person2: { name: string } = bar("Hello", 5);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : (name: string, id: number) => { name: string; id: number; }
 >    : ^    ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
 var person3: { name: string; id: number } = bar("Hello", 5);
 >person3 : { name: string; id: number; }
@@ -124,8 +124,8 @@ var person3: { name: string; id: number } = bar("Hello", 5);
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bar : (name: string, id: number) => { name: string; id: number; }
 >    : ^    ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.types b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.types
index 5c06f9caae0..0ab665122e7 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.types
@@ -4,14 +4,14 @@
 var id: number = 10000;
 >id : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 
 var name: string = "my name";
 >name : string
 >     : ^^^^^^
->"my name" : string
->          : ^^^^^^
+>"my name" : "my name"
+>          : ^^^^^^^^^
 
 var person: { b: string; id: number } = { name, id };  // error
 >person : { b: string; id: number; }
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
index b59753586fc..0597a019c03 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
@@ -4,14 +4,14 @@
 var id: number = 10000;
 >id : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 
 var name: string = "my name";
 >name : string
 >     : ^^^^^^
->"my name" : string
->          : ^^^^^^
+>"my name" : "my name"
+>          : ^^^^^^^^^
 
 var person: { b: string; id: number } = { name, id };  // error
 >person : { b: string; id: number; }
@@ -82,8 +82,8 @@ var person2: { name: string, id: number } = bar("hello", 5);
 >                : ^^^^^^^^      ^^^^^^      ^^^
 >bar : (name: string, id: number) => { name: number; id: string; }
 >    : ^    ^^      ^^  ^^      ^^^^^                             
->"hello" : string
->        : ^^^^^^
->5 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.types b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.types
index 9d5f479e16e..9fe8e58a275 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.types
@@ -4,14 +4,14 @@
 var id: number = 10000;
 >id : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 
 var name: string = "my name";
 >name : string
 >     : ^^^^^^
->"my name" : string
->          : ^^^^^^
+>"my name" : "my name"
+>          : ^^^^^^^^^
 
 var person = { name, id };
 >person : { name: string; id: number; }
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.types b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.types
index de4f15c9645..de8e4c7ab8d 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.types
@@ -4,14 +4,14 @@
 var id: number = 10000;
 >id : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 
 var name: string = "my name";
 >name : string
 >     : ^^^^^^
->"my name" : string
->          : ^^^^^^
+>"my name" : "my name"
+>          : ^^^^^^^^^
 
 var person = { name, id };
 >person : { name: string; id: number; }
diff --git a/tests/baselines/reference/objectLiteralWithNumericPropertyName.errors.txt b/tests/baselines/reference/objectLiteralWithNumericPropertyName.errors.txt
index b179acd3ad0..4a71e241285 100644
--- a/tests/baselines/reference/objectLiteralWithNumericPropertyName.errors.txt
+++ b/tests/baselines/reference/objectLiteralWithNumericPropertyName.errors.txt
@@ -1,6 +1,4 @@
-objectLiteralWithNumericPropertyName.ts(4,5): error TS2322: Type '{ 0: number; }' is not assignable to type 'A'.
-  Types of property '0' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+objectLiteralWithNumericPropertyName.ts(5,5): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
 ==== objectLiteralWithNumericPropertyName.ts (1 errors) ====
@@ -8,10 +6,9 @@ objectLiteralWithNumericPropertyName.ts(4,5): error TS2322: Type '{ 0: number; }
         0: string;
     }
     var x: A = {
-        ~
-!!! error TS2322: Type '{ 0: number; }' is not assignable to type 'A'.
-!!! error TS2322:   Types of property '0' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
         0: 3
+        ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6500 objectLiteralWithNumericPropertyName.ts:2:5: The expected type comes from property '0' which is declared here on type 'A'
     };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralWithNumericPropertyName.types b/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
index 6f43525d368..989ed796b6f 100644
--- a/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
+++ b/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
@@ -15,8 +15,8 @@ var x: A = {
     0: 3
 >0 : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 };
 
diff --git a/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types b/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types
index 649e86de1df..5605e330dee 100644
--- a/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types
+++ b/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types
@@ -28,8 +28,8 @@ let x: Foo[] = [
 >              : ^^^^^^^^^^^^^^^^^
 >prop : number
 >     : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 ]
 
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index 62dc749a767..f363e066c76 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -220,12 +220,12 @@ var { x, ...fresh } = { x: 1, y: 2 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 class Removable {
 >Removable : Removable
@@ -248,8 +248,8 @@ class Removable {
     get both(): number { return 12 }
 >both : number
 >     : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     set both(value: number) { }
 >both : number
diff --git a/tests/baselines/reference/objectRest2.types b/tests/baselines/reference/objectRest2.types
index b21e6eff91f..0b7e6034763 100644
--- a/tests/baselines/reference/objectRest2.types
+++ b/tests/baselines/reference/objectRest2.types
@@ -61,6 +61,6 @@ rootConnection('test');
 >                       : ^^^^^^^^^^^^       ^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^
 >rootConnection : (name: string) => { resolve: (context: any, args: any) => Promise<{}>; }
 >               : ^    ^^      ^^^^^^^^^^^^^^^^^       ^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/objectRestForOf.types b/tests/baselines/reference/objectRestForOf.types
index b452c4df45a..cceefcfec54 100644
--- a/tests/baselines/reference/objectRestForOf.types
+++ b/tests/baselines/reference/objectRestForOf.types
@@ -78,8 +78,8 @@ for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
 >  : ^^^^^      ^^^^^      ^^^
 >x : string
 >  : ^^^^^^
->'a string' : string
->           : ^^^^^^
+>'a string' : "a string"
+>           : ^^^^^^^^^^
 
     [norest.x, norest.y];
 >[norest.x, norest.y] : string[]
diff --git a/tests/baselines/reference/objectRestParameter.types b/tests/baselines/reference/objectRestParameter.types
index 9fb6e679412..5e6fc34404e 100644
--- a/tests/baselines/reference/objectRestParameter.types
+++ b/tests/baselines/reference/objectRestParameter.types
@@ -79,8 +79,8 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo'
 >  : ^
 >y : string
 >  : ^^^^^^
->'noo' : string
->      : ^^^^^^
+>'noo' : "noo"
+>      : ^^^^^
 >rest.y + nested.ka : string
 >                   : ^^^^^^
 >rest.y : string
diff --git a/tests/baselines/reference/objectRestParameterES5.types b/tests/baselines/reference/objectRestParameterES5.types
index 592e8041aac..bb237dd286d 100644
--- a/tests/baselines/reference/objectRestParameterES5.types
+++ b/tests/baselines/reference/objectRestParameterES5.types
@@ -79,8 +79,8 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo'
 >  : ^
 >y : string
 >  : ^^^^^^
->'noo' : string
->      : ^^^^^^
+>'noo' : "noo"
+>      : ^^^^^
 >rest.y + nested.ka : string
 >                   : ^^^^^^
 >rest.y : string
diff --git a/tests/baselines/reference/objectRestPropertyMustBeLast.types b/tests/baselines/reference/objectRestPropertyMustBeLast.types
index 15b31812f0d..d0f80bdb2ac 100644
--- a/tests/baselines/reference/objectRestPropertyMustBeLast.types
+++ b/tests/baselines/reference/objectRestPropertyMustBeLast.types
@@ -28,8 +28,8 @@ var {...a, x } = { x: 1 };    // Error, rest must be last property
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var {...a, x, ...b } = { x: 1 };    // Error, rest must be last property
 >a : {}
@@ -62,6 +62,6 @@ var {...a, x, ...b } = { x: 1 };    // Error, rest must be last property
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/objectRestReadonly.types b/tests/baselines/reference/objectRestReadonly.types
index f3883d02300..24c6049b250 100644
--- a/tests/baselines/reference/objectRestReadonly.types
+++ b/tests/baselines/reference/objectRestReadonly.types
@@ -28,19 +28,19 @@ const obj: Readonly<ObjType> = {
   foo: 'bar',
 >foo : string
 >    : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
   baz: 'qux',
 >baz : string
 >    : ^^^^^^
->'qux' : string
->      : ^^^^^^
+>'qux' : "qux"
+>      : ^^^^^
 
   quux: 'quuz',
 >quux : string
 >     : ^^^^^^
->'quuz' : string
+>'quuz' : "quuz"
 >       : ^^^^^^
 }
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index b2eae8bd306..92ca81fce93 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -100,8 +100,8 @@ let override: { a: number, b: string } =
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'override' : string
->           : ^^^^^^
+>'override' : "override"
+>           : ^^^^^^^^^^
 
 let nested: { a: number, b: boolean, c: string } =
 >nested : { a: number; b: boolean; c: string; }
@@ -120,8 +120,8 @@ let nested: { a: number, b: boolean, c: string } =
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ b: false, c: 'overriden' } : { b: false; c: string; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^
 >b : false
@@ -130,12 +130,12 @@ let nested: { a: number, b: boolean, c: string } =
 >      : ^^^^^
 >c : string
 >  : ^^^^^^
->'overriden' : string
->            : ^^^^^^
+>'overriden' : "overriden"
+>            : ^^^^^^^^^^^
 >c : string
 >  : ^^^^^^
->'whatever' : string
->           : ^^^^^^
+>'whatever' : "whatever"
+>           : ^^^^^^^^^^
 
 let combined: { a: number, b: string, c: boolean } =
 >combined : { a: number; b: string; c: boolean; }
@@ -174,8 +174,8 @@ let combinedAfter: { a: number, b: string, c: boolean } =
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 
 let combinedNestedChangeType: { a: number, b: boolean, c: number } =
 >combinedNestedChangeType : { a: number; b: boolean; c: number; }
@@ -194,8 +194,8 @@ let combinedNestedChangeType: { a: number, b: boolean, c: number } =
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: false, c: 'overriden' } : { b: false; c: string; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^
 >b : false
@@ -204,8 +204,8 @@ let combinedNestedChangeType: { a: number, b: boolean, c: number } =
 >      : ^^^^^
 >c : string
 >  : ^^^^^^
->'overriden' : string
->            : ^^^^^^
+>'overriden' : "overriden"
+>            : ^^^^^^^^^^^
 >c : number
 >  : ^^^^^^
 >-1 : -1
@@ -260,20 +260,20 @@ let getter: { a: number, c: number } =
 >   : ^^^^^^^^^^^^^^^^^^^^^^^
 >c : number
 >  : ^^^^^^
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
 getter.a = 12;
->getter.a = 12 : number
->              : ^^^^^^
+>getter.a = 12 : 12
+>              : ^^
 >getter.a : number
 >         : ^^^^^^
 >getter : { a: number; c: number; }
 >       : ^^^^^      ^^^^^      ^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 // functions result in { }
 let spreadFunc = { ...(function () { }) };
@@ -381,8 +381,8 @@ function conditionalSpreadBoolean(b: boolean) : { x: number, y: number } {
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->14 : number
->   : ^^^^^^
+>14 : 14
+>   : ^^
     }
     let o2 = { ...b && { x: 21 }}
 >o2 : { x?: number | undefined; }
@@ -628,8 +628,8 @@ let changeTypeAfter: { a: string, b: string } =
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'wrong type?' : string
->              : ^^^^^^
+>'wrong type?' : "wrong type?"
+>              : ^^^^^^^^^^^^^
 
 let changeTypeBoth: { a: string, b: number } =
 >changeTypeBoth : { a: string; b: number; }
@@ -736,14 +736,14 @@ function container(
 >                      : ^^^^^^
 >'before everything' : "before everything"
 >                    : ^^^^^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >o : { a: number; b: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'yes' : string
->      : ^^^^^^
+>'yes' : "yes"
+>      : ^^^^^
 
     let computedAfter: { a: number, b: string, "at the end": number } =
 >computedAfter : { a: number; b: string; "at the end": number; }
@@ -762,14 +762,14 @@ function container(
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'yeah' : string
+>'yeah' : "yeah"
 >       : ^^^^^^
 >['at the end'] : number
 >               : ^^^^^^
 >'at the end' : "at the end"
 >             : ^^^^^^^^^^^^
->14 : number
->   : ^^^^^^
+>14 : 14
+>   : ^^
 }
 // shortcut syntax
 let a = 12;
@@ -849,18 +849,18 @@ let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->'yes' : string
->      : ^^^^^^
+>'yes' : "yes"
+>      : ^^^^^
 >{ c: 'no', d: false } : { c: string; d: false; }
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^
 >c : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 >d : false
 >  : ^^^^^
 >false : false
@@ -885,18 +885,18 @@ let overlap: { id: string, a: number, b: string } =
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ a: 2, b: 'extra' } : { a: number; b: string; }
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >b : string
 >  : ^^^^^^
->'extra' : string
->        : ^^^^^^
+>'extra' : "extra"
+>        : ^^^^^^^
 
 let overlapConflict: { id:string, a: string } =
 >overlapConflict : { id: string; a: string; }
@@ -915,14 +915,14 @@ let overlapConflict: { id:string, a: string } =
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ a: 'mismatch' } : { a: string; }
 >                  : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'mismatch' : string
->           : ^^^^^^
+>'mismatch' : "mismatch"
+>           : ^^^^^^^^^^
 
 let overwriteId: { id: string, a: number, c: number, d: string } =
 >overwriteId : { id: string; a: number; c: number; d: string; }
@@ -945,8 +945,8 @@ let overwriteId: { id: string, a: number, c: number, d: string } =
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >id : true
 >   : ^^^^
 >true : true
@@ -955,12 +955,12 @@ let overwriteId: { id: string, a: number, c: number, d: string } =
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >d : string
 >  : ^^^^^^
->'no' : string
->     : ^^^^^^
+>'no' : "no"
+>     : ^^^^
 
 function genericSpread<T, U>(t: T, u: U, v: T | U, w: T | { s: string }, obj: { x: number }) {
 >genericSpread : <T, U>(t: T, u: U, v: T | U, w: T | { s: string; }, obj: { x: number; }) => void
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.types b/tests/baselines/reference/objectSpreadComputedProperty.types
index 0fb06b085de..e01a76d1cc6 100644
--- a/tests/baselines/reference/objectSpreadComputedProperty.types
+++ b/tests/baselines/reference/objectSpreadComputedProperty.types
@@ -9,14 +9,14 @@ function f() {
     let n: number = 12;
 >n : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     let m: number = 13;
 >m : number
 >  : ^^^^^^
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 
     let a: any = null;
 >a : any
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
index f446956be60..037cdf90324 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -98,14 +98,14 @@ var writable = { ...roindex };
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 writable.a = 0;  // should be ok.
->writable.a = 0 : number
->               : ^^^^^^
+>writable.a = 0 : 0
+>               : ^
 >writable.a : number
 >           : ^^^^^^
 >writable : { [x: string]: number; }
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 8f780c5b19e..860b430be4b 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -21,7 +21,7 @@ objectSpreadNegative.ts(52,20): error TS2698: Spread types may only be created f
 objectSpreadNegative.ts(54,19): error TS2698: Spread types may only be created from object types.
 objectSpreadNegative.ts(59,1): error TS2349: This expression is not callable.
   Type '{}' has no call signatures.
-objectSpreadNegative.ts(63,1): error TS2322: Type 'number' is not assignable to type 'undefined'.
+objectSpreadNegative.ts(63,1): error TS2322: Type '12' is not assignable to type 'undefined'.
 objectSpreadNegative.ts(69,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
 objectSpreadNegative.ts(74,11): error TS2339: Property 'a' does not exist on type '{}'.
 
@@ -142,7 +142,7 @@ objectSpreadNegative.ts(74,11): error TS2339: Property 'a' does not exist on typ
     let setterOnly = { ...{ set b (bad: number) { } } };
     setterOnly.b = 12; // error, 'b' does not exist
     ~~~~~~~~~~~~
-!!! error TS2322: Type 'number' is not assignable to type 'undefined'.
+!!! error TS2322: Type '12' is not assignable to type 'undefined'.
     
     // methods are skipped because they aren't enumerable
     class C { p = 1; m() { } }
diff --git a/tests/baselines/reference/objectSpreadNegative.types b/tests/baselines/reference/objectSpreadNegative.types
index a64a8d36020..75bdcf50aeb 100644
--- a/tests/baselines/reference/objectSpreadNegative.types
+++ b/tests/baselines/reference/objectSpreadNegative.types
@@ -122,8 +122,8 @@ spread = { s: "foo" };  // error, missing 'b'
 >             : ^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 let b = { b: false };
 >b : { b: boolean; }
@@ -190,8 +190,8 @@ let ignore: { a: number, b: string } =
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'ignored' : string
->          : ^^^^^^
+>'ignored' : "ignored"
+>          : ^^^^^^^^^
 >o : { a: number; b: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -238,8 +238,8 @@ let combinedBefore: { a: number, b: string, c: boolean } =
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 >o3 : { a: number; b: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >o4 : { b: string; c: boolean; }
@@ -262,8 +262,8 @@ let combinedMid: { a: number, b: string, c: boolean } =
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 >o4 : { b: string; c: boolean; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -286,8 +286,8 @@ let combinedNested: { a: number, b: boolean, c: string, d: string } =
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >{ b: false, c: 'overriden' } : { b: false; c: string; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^
 >b : false
@@ -296,22 +296,22 @@ let combinedNested: { a: number, b: boolean, c: string, d: string } =
 >      : ^^^^^
 >c : string
 >  : ^^^^^^
->'overriden' : string
->            : ^^^^^^
+>'overriden' : "overriden"
+>            : ^^^^^^^^^^^
 >d : string
 >  : ^^^^^^
->'actually new' : string
->               : ^^^^^^
+>'actually new' : "actually new"
+>               : ^^^^^^^^^^^^^^
 >{ a: 5, d: 'maybe new' } : { a: number; d: string; }
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >d : string
 >  : ^^^^^^
->'maybe new' : string
->            : ^^^^^^
+>'maybe new' : "maybe new"
+>            : ^^^^^^^^^^^
 
 let changeTypeBefore: { a: number, b: string } =
 >changeTypeBefore : { a: number; b: string; }
@@ -326,8 +326,8 @@ let changeTypeBefore: { a: number, b: string } =
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'wrong type?' : string
->              : ^^^^^^
+>'wrong type?' : "wrong type?"
+>              : ^^^^^^^^^^^^^
 >o3 : { a: number; b: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -352,12 +352,12 @@ let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number
 >                  : ^^^^^^
 >'in the middle' : "in the middle"
 >                : ^^^^^^^^^^^^^^^
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 >b : string
 >  : ^^^^^^
->'maybe?' : string
->         : ^^^^^^
+>'maybe?' : "maybe?"
+>         : ^^^^^^^^
 >o4 : { b: string; c: boolean; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -475,16 +475,16 @@ let setterOnly = { ...{ set b (bad: number) { } } };
 >    : ^^^^^^
 
 setterOnly.b = 12; // error, 'b' does not exist
->setterOnly.b = 12 : number
->                  : ^^^^^^
+>setterOnly.b = 12 : 12
+>                  : ^^
 >setterOnly.b : undefined
 >             : ^^^^^^^^^
 >setterOnly : { b: undefined; }
 >           : ^^^^^^^^^^^^^^^^^
 >b : undefined
 >  : ^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 // methods are skipped because they aren't enumerable
 class C { p = 1; m() { } }
diff --git a/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.types b/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.types
index 7d83ea389be..920ff914c22 100644
--- a/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.types
+++ b/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.types
@@ -908,14 +908,14 @@ parseWithSpread({ a: 1, b: 2, z: 26 })
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >z : number
 >  : ^^^^^^
->26 : number
->   : ^^^^^^
+>26 : 26
+>   : ^^
 
diff --git a/tests/baselines/reference/objectSpreadSetonlyAccessor.types b/tests/baselines/reference/objectSpreadSetonlyAccessor.types
index 30dd25e639d..747ad1cb36c 100644
--- a/tests/baselines/reference/objectSpreadSetonlyAccessor.types
+++ b/tests/baselines/reference/objectSpreadSetonlyAccessor.types
@@ -12,8 +12,8 @@ const o1: { foo: number, bar: undefined } = { foo: 1, ... { set bar(_v: number)
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ set bar(_v: number) { } } : { bar: number; }
 >                            : ^^^^^^^^^^^^^^^^
 >bar : number
@@ -30,8 +30,8 @@ const o2: { foo: undefined } = { foo: 1, ... { set foo(_v: number) { } } }
 >                                            : ^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ set foo(_v: number) { } } : { foo: number; }
 >                            : ^^^^^^^^^^^^^^^^
 >foo : number
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
index 6db80f85c78..82d62bbbe0c 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
@@ -38,8 +38,8 @@ class C {
     toString(): number { return 1; }
 >toString : () => number
 >         : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 var c: C;
 >c : C
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index 0e006a42973..bf3edffdf54 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -67,8 +67,8 @@ var b: { [x: number]: string; } = { 0: '' };
 >          : ^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index 714d945abf6..f7baf1b6bb4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -67,8 +67,8 @@ var b: { [x: number]: string; } = { 0: '' };
 >          : ^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
index 8180539a3a6..7bc1599ef7a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
@@ -67,8 +67,8 @@ var b: { [x: string]: string; } = { foo: '' };
 >            : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
diff --git a/tests/baselines/reference/omitTypeHelperModifiers01.types b/tests/baselines/reference/omitTypeHelperModifiers01.types
index 7d6ef545601..eb2c0a09611 100644
--- a/tests/baselines/reference/omitTypeHelperModifiers01.types
+++ b/tests/baselines/reference/omitTypeHelperModifiers01.types
@@ -44,16 +44,16 @@ function f(x: B) {
 >  : ^^^^^^^^^^^^^^^^^^
 
     x.b = "hello";
->x.b = "hello" : string
->              : ^^^^^^
+>x.b = "hello" : "hello"
+>              : ^^^^^^^
 >x.b : string | undefined
 >    : ^^^^^^^^^^^^^^^^^^
 >x : B
 >  : ^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x.b = undefined;
 >x.b = undefined : undefined
diff --git a/tests/baselines/reference/operatorsAndIntersectionTypes.types b/tests/baselines/reference/operatorsAndIntersectionTypes.types
index 7b601c8ede3..aa72d357736 100644
--- a/tests/baselines/reference/operatorsAndIntersectionTypes.types
+++ b/tests/baselines/reference/operatorsAndIntersectionTypes.types
@@ -50,16 +50,16 @@ let guid = createGuid();
 >           : ^^^^^^    
 
 map1[guid] = 123;  // Can with tagged string
->map1[guid] = 123 : number
->                 : ^^^^^^
+>map1[guid] = 123 : 123
+>                 : ^^^
 >map1[guid] : number
 >           : ^^^^^^
 >map1 : { [x: string]: number; }
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^
 >guid : Guid
 >     : ^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 let map2: { [x: number]: string } = {};
 >map2 : { [x: number]: string; }
@@ -78,16 +78,16 @@ let serialNo = createSerialNo();
 >               : ^^^^^^        
 
 map2[serialNo] = "hello";  // Can index with tagged number
->map2[serialNo] = "hello" : string
->                         : ^^^^^^
+>map2[serialNo] = "hello" : "hello"
+>                         : ^^^^^^^
 >map2[serialNo] : string
 >               : ^^^^^^
 >map2 : { [x: number]: string; }
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^
 >serialNo : SerialNo
 >         : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 const s1 = "{" + guid + "}";
 >s1 : string
@@ -146,8 +146,8 @@ const s5 = serialNo.toPrecision(0);
 >         : ^^^^^^^^
 >toPrecision : (precision?: number) => string
 >            : ^         ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const n1 = serialNo * 3;
 >n1 : number
diff --git a/tests/baselines/reference/optionalAccessorsInInterface1.types b/tests/baselines/reference/optionalAccessorsInInterface1.types
index 20dc5377ef0..dfbf4a49512 100644
--- a/tests/baselines/reference/optionalAccessorsInInterface1.types
+++ b/tests/baselines/reference/optionalAccessorsInInterface1.types
@@ -27,7 +27,7 @@ defineMyProperty({}, "name", { get: function () { return 5; } });
 >                 : ^ ^^   ^^ ^^      ^^          ^^                    ^^^^^   
 >{} : {}
 >   : ^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >{ get: function () { return 5; } } : { get: () => number; }
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^
@@ -64,7 +64,7 @@ defineMyProperty2({}, "name", { get: function () { return 5; } });
 >                  : ^ ^^   ^^ ^^      ^^          ^^                     ^^^^^   
 >{} : {}
 >   : ^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >{ get: function () { return 5; } } : { get: () => number; }
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/optionalArgsWithDefaultValues.types b/tests/baselines/reference/optionalArgsWithDefaultValues.types
index 747e58b41bd..9cecc068242 100644
--- a/tests/baselines/reference/optionalArgsWithDefaultValues.types
+++ b/tests/baselines/reference/optionalArgsWithDefaultValues.types
@@ -69,8 +69,8 @@ var b = (x, y?:number = 2) => { x; };
 >  : ^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/optionalBindingParameters1.types b/tests/baselines/reference/optionalBindingParameters1.types
index ac82b178ab6..7bdb4dd92c4 100644
--- a/tests/baselines/reference/optionalBindingParameters1.types
+++ b/tests/baselines/reference/optionalBindingParameters1.types
@@ -20,10 +20,10 @@ foo(["", 0, false]);
 >    : ^         ^^^                         ^^^^^^^^^
 >["", 0, false] : [string, number, false]
 >               : ^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 >false : false
 >      : ^^^^^
 
@@ -36,8 +36,8 @@ foo([false, 0, ""]);
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >false : false
 >      : ^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >"" : ""
 >   : ^^
 
diff --git a/tests/baselines/reference/optionalBindingParameters2.types b/tests/baselines/reference/optionalBindingParameters2.types
index be70aadc5f8..0236242b6b4 100644
--- a/tests/baselines/reference/optionalBindingParameters2.types
+++ b/tests/baselines/reference/optionalBindingParameters2.types
@@ -28,12 +28,12 @@ foo({ x: "", y: 0, z: false });
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : false
 >  : ^^^^^
 >false : false
@@ -52,8 +52,8 @@ foo({ x: false, y: 0, z: "" });
 >      : ^^^^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : string
 >  : ^^^^^^
 >"" : ""
diff --git a/tests/baselines/reference/optionalBindingParameters3.types b/tests/baselines/reference/optionalBindingParameters3.types
index 895212b8567..d52ec7a92b7 100644
--- a/tests/baselines/reference/optionalBindingParameters3.types
+++ b/tests/baselines/reference/optionalBindingParameters3.types
@@ -14,6 +14,6 @@ function f({ a = "a" }) {}
 >  : ^     ^^^   ^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads1.types b/tests/baselines/reference/optionalBindingParametersInOverloads1.types
index 4746bf5f004..a3e983a9981 100644
--- a/tests/baselines/reference/optionalBindingParametersInOverloads1.types
+++ b/tests/baselines/reference/optionalBindingParametersInOverloads1.types
@@ -26,10 +26,10 @@ foo(["", 0, false]);
 >    : ^         ^^^                         ^^^^^^^^
 >["", 0, false] : [string, number, false]
 >               : ^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>0 : 0
+>  : ^
 >false : false
 >      : ^^^^^
 
@@ -42,8 +42,8 @@ foo([false, 0, ""]);
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >false : false
 >      : ^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >"" : ""
 >   : ^^
 
diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads2.types b/tests/baselines/reference/optionalBindingParametersInOverloads2.types
index 275e61252bc..03f9d381734 100644
--- a/tests/baselines/reference/optionalBindingParametersInOverloads2.types
+++ b/tests/baselines/reference/optionalBindingParametersInOverloads2.types
@@ -34,12 +34,12 @@ foo({ x: "", y: 0, z: false });
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : false
 >  : ^^^^^
 >false : false
@@ -58,8 +58,8 @@ foo({ x: false, y: 0, z: "" });
 >      : ^^^^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >z : string
 >  : ^^^^^^
 >"" : ""
diff --git a/tests/baselines/reference/optionalMethods.types b/tests/baselines/reference/optionalMethods.types
index aa241752581..7230b9e6cfb 100644
--- a/tests/baselines/reference/optionalMethods.types
+++ b/tests/baselines/reference/optionalMethods.types
@@ -347,7 +347,7 @@ class Derived extends Base {
     f(): number { return 1; }
 >f : () => number
 >  : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
diff --git a/tests/baselines/reference/optionalParamArgsTest.types b/tests/baselines/reference/optionalParamArgsTest.types
index 2e2f69b4cb8..389e09f6a8d 100644
--- a/tests/baselines/reference/optionalParamArgsTest.types
+++ b/tests/baselines/reference/optionalParamArgsTest.types
@@ -45,18 +45,18 @@ class C1 {
     constructor(v: number = 1, p: number = 0) { }
 >v : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >p : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public n:number = 0;
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     public C1M1() { return 0; } // returning C1M1A1 will result in "Unresolved symbol C1M1A1"
 >C1M1 : () => number
@@ -78,8 +78,8 @@ class C1 {
 >     : ^      ^^^      ^^      ^^^      ^^^^^^^^^^^
 >C1M3A1 : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >C1M3A2 : number
 >       : ^^^^^^
 >C1M3A1 : number
@@ -113,8 +113,8 @@ class C1 {
 >       : ^^^^^^
 >C1M5A2 : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >C1M5A3 : number
 >       : ^^^^^^
 >C1M5A1 + C1M5A2 : number
@@ -132,8 +132,8 @@ class C1 {
 >       : ^^^^^^
 >C1M5A2 : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >C1M5A3 : number
 >       : ^^^^^^
 >C1M5A1 + C1M5A2 : number
@@ -153,8 +153,8 @@ class C2 extends C1 {
     constructor(v2: number = 6) {
 >v2 : number
 >   : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
         super(v2);
 >super(v2) : void
@@ -274,8 +274,8 @@ var c1o1:C1 = new C1(5);
 >          : ^^
 >C1 : typeof C1
 >   : ^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 var i1o1:I1 = new C1(5);
 >i1o1 : I1
@@ -284,8 +284,8 @@ var i1o1:I1 = new C1(5);
 >          : ^^
 >C1 : typeof C1
 >   : ^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 // Valid
 c1o1.C1M1();
@@ -324,8 +324,8 @@ c1o1.C1M2(1);
 >     : ^^
 >C1M2 : (C1M2A1: number) => number
 >     : ^      ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i1o1.C1M2(1);
 >i1o1.C1M2(1) : number
@@ -336,8 +336,8 @@ i1o1.C1M2(1);
 >     : ^^
 >C1M2 : (C1M2A1: number) => number
 >     : ^      ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f2v1=F2(1);
 >f2v1 : number
@@ -346,8 +346,8 @@ var f2v1=F2(1);
 >      : ^^^^^^
 >F2 : (F2A1: number) => number
 >   : ^    ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var l2v1=L2(1);
 >l2v1 : number
@@ -356,8 +356,8 @@ var l2v1=L2(1);
 >      : ^^^^^^
 >L2 : (L2A1: number) => number
 >   : ^    ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Valid
 c1o1.C1M3(1,2);
@@ -369,10 +369,10 @@ c1o1.C1M3(1,2);
 >     : ^^
 >C1M3 : (C1M3A1?: number, C1M3A2?: number) => number
 >     : ^      ^^^      ^^      ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 i1o1.C1M3(1,2);
 >i1o1.C1M3(1,2) : number
@@ -383,10 +383,10 @@ i1o1.C1M3(1,2);
 >     : ^^
 >C1M3 : (C1M3A1?: number, C1M3A2?: number) => number
 >     : ^      ^^^      ^^      ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var f3v1=F3(1,2);
 >f3v1 : number
@@ -395,10 +395,10 @@ var f3v1=F3(1,2);
 >        : ^^^^^^
 >F3 : (F3A1?: number, F3A2?: number) => number
 >   : ^    ^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var l3v1=L3(1,2);
 >l3v1 : number
@@ -407,10 +407,10 @@ var l3v1=L3(1,2);
 >        : ^^^^^^
 >L3 : (L3A1?: number, L3A2?: number) => number
 >   : ^    ^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // Valid
 c1o1.C1M4(1,2);
@@ -422,10 +422,10 @@ c1o1.C1M4(1,2);
 >     : ^^
 >C1M4 : (C1M4A1: number, C1M4A2?: number) => number
 >     : ^      ^^      ^^      ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 i1o1.C1M4(1,2);
 >i1o1.C1M4(1,2) : number
@@ -436,10 +436,10 @@ i1o1.C1M4(1,2);
 >     : ^^
 >C1M4 : (C1M4A1: number, C1M4A2?: number) => number
 >     : ^      ^^      ^^      ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var f4v1=F4(1,2);
 >f4v1 : number
@@ -448,10 +448,10 @@ var f4v1=F4(1,2);
 >        : ^^^^^^
 >F4 : (F4A1: number, F4A2?: number) => number
 >   : ^    ^^      ^^    ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var l4v1=L4(1,2);
 >l4v1 : number
@@ -460,10 +460,10 @@ var l4v1=L4(1,2);
 >        : ^^^^^^
 >L4 : (L4A1: number, L4A2?: number) => number
 >   : ^    ^^      ^^    ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // Valid
 c1o1.C1M3(1);
@@ -475,8 +475,8 @@ c1o1.C1M3(1);
 >     : ^^
 >C1M3 : (C1M3A1?: number, C1M3A2?: number) => number
 >     : ^      ^^^      ^^      ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i1o1.C1M3(1);
 >i1o1.C1M3(1) : number
@@ -487,8 +487,8 @@ i1o1.C1M3(1);
 >     : ^^
 >C1M3 : (C1M3A1?: number, C1M3A2?: number) => number
 >     : ^      ^^^      ^^      ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f3v2=F3(1);
 >f3v2 : number
@@ -497,8 +497,8 @@ var f3v2=F3(1);
 >      : ^^^^^^
 >F3 : (F3A1?: number, F3A2?: number) => number
 >   : ^    ^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var l3v2=L3(1);
 >l3v2 : number
@@ -507,8 +507,8 @@ var l3v2=L3(1);
 >      : ^^^^^^
 >L3 : (L3A1?: number, L3A2?: number) => number
 >   : ^    ^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Valid 
 c1o1.C1M3();
@@ -557,8 +557,8 @@ c1o1.C1M4(1);
 >     : ^^
 >C1M4 : (C1M4A1: number, C1M4A2?: number) => number
 >     : ^      ^^      ^^      ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 i1o1.C1M4(1);
 >i1o1.C1M4(1) : number
@@ -569,8 +569,8 @@ i1o1.C1M4(1);
 >     : ^^
 >C1M4 : (C1M4A1: number, C1M4A2?: number) => number
 >     : ^      ^^      ^^      ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var f4v2=F4(1);
 >f4v2 : number
@@ -579,8 +579,8 @@ var f4v2=F4(1);
 >      : ^^^^^^
 >F4 : (F4A1: number, F4A2?: number) => number
 >   : ^    ^^      ^^    ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var l4v2=L4(1);
 >l4v2 : number
@@ -589,8 +589,8 @@ var l4v2=L4(1);
 >      : ^^^^^^
 >L4 : (L4A1: number, L4A2?: number) => number
 >   : ^    ^^      ^^    ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Negative tests - we expect these cases to fail
 c1o1.C1M1(1);
@@ -674,8 +674,8 @@ c1o1.C1M2(1,2);
 >     : ^^
 >C1M2 : (C1M2A1: number) => number
 >     : ^      ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -688,8 +688,8 @@ i1o1.C1M2(1,2);
 >     : ^^
 >C1M2 : (C1M2A1: number) => number
 >     : ^      ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -698,8 +698,8 @@ F2(1,2);
 >        : ^^^^^^
 >F2 : (F2A1: number) => number
 >   : ^    ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -708,8 +708,8 @@ L2(1,2);
 >        : ^^^^^^
 >L2 : (L2A1: number) => number
 >   : ^    ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -722,10 +722,10 @@ c1o1.C1M3(1,2,3);
 >     : ^^
 >C1M3 : (C1M3A1?: number, C1M3A2?: number) => number
 >     : ^      ^^^      ^^      ^^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -738,10 +738,10 @@ i1o1.C1M3(1,2,3);
 >     : ^^
 >C1M3 : (C1M3A1?: number, C1M3A2?: number) => number
 >     : ^      ^^^      ^^      ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -750,10 +750,10 @@ F3(1,2,3);
 >          : ^^^^^^
 >F3 : (F3A1?: number, F3A2?: number) => number
 >   : ^    ^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -762,10 +762,10 @@ L3(1,2,3);
 >          : ^^^^^^
 >L3 : (L3A1?: number, L3A2?: number) => number
 >   : ^    ^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -834,18 +834,18 @@ fnOpt1(1, [2, 3], [1], true);
 >                             : ^^^^
 >fnOpt1 : (id: number, children?: number[], expectedPath?: number[], isRoot?: boolean) => void
 >       : ^  ^^      ^^        ^^^        ^^            ^^^        ^^      ^^^       ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2, 3] : number[]
 >       : ^^^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -854,18 +854,18 @@ fnOpt2(1, [2, 3], [1], true);
 >                             : ^^^^
 >fnOpt2 : (id: number, children?: number[], expectedPath?: number[], isRoot?: boolean) => void
 >       : ^  ^^      ^^        ^^^        ^^            ^^^        ^^      ^^^       ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2, 3] : number[]
 >       : ^^^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types b/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types
index aabfac4def1..e4aa613f537 100644
--- a/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types
+++ b/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types
@@ -26,12 +26,12 @@ function func1( {a, b}: {a: number, b?: number} = {a: 1, b: 2} ) {
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
   f(a, b)
 >f(a, b) : void
@@ -53,8 +53,8 @@ function func2( {a, b = 3}: {a: number, b?:number} = {a: 1,b: 2} ) {
 >  : ^^^^^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >a : number
 >  : ^^^^^^
 >b : number | undefined
@@ -63,12 +63,12 @@ function func2( {a, b = 3}: {a: number, b?:number} = {a: 1,b: 2} ) {
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
   f(a, b)
 >f(a, b) : void
@@ -98,8 +98,8 @@ function func3( {a, b}: {a: number, b?: number} = {a: 1} ) {
 >       : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   f(a,b)
 >f(a,b) : void
@@ -141,16 +141,16 @@ function func4( {a: {b, c}, d}: {a: {b: number,c?: number},d: number} = {a: {b:
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >d : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
   f(b,c)
 >f(b,c) : void
@@ -174,8 +174,8 @@ function func5({a: {b, c = 4}, d}: {a: {b: number,c?: number},d: number} = {a: {
 >  : ^^^^^^
 >c : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >d : number
 >  : ^^^^^^
 >a : { b: number; c?: number; }
@@ -194,16 +194,16 @@ function func5({a: {b, c = 4}, d}: {a: {b: number,c?: number},d: number} = {a: {
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >d : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
   f(b, c)
 >f(b, c) : void
@@ -231,12 +231,12 @@ function func6( {a: {b, c} = {b: 4, c: 5}, d}: {a: {b: number, c?: number}, d: n
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >c : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >d : number
 >  : ^^^^^^
 >a : { b: number; c?: number; }
@@ -255,16 +255,16 @@ function func6( {a: {b, c} = {b: 4, c: 5}, d}: {a: {b: number, c?: number}, d: n
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >d : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
   f(b, c)
 >f(b, c) : void
@@ -288,18 +288,18 @@ function func7( {a: {b, c = 6} = {b: 4, c: 5}, d}: {a: {b: number, c?: number},
 >  : ^^^^^^
 >c : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >{b: 4, c: 5} : { b: number; c: number; }
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >c : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >d : number
 >  : ^^^^^^
 >a : { b: number; c?: number; }
@@ -318,16 +318,16 @@ function func7( {a: {b, c = 6} = {b: 4, c: 5}, d}: {a: {b: number, c?: number},
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >c : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >d : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
   f(b, c)
 >f(b, c) : void
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration.types b/tests/baselines/reference/optionalParamterAndVariableDeclaration.types
index 2c96e01565b..bb9dc753a39 100644
--- a/tests/baselines/reference/optionalParamterAndVariableDeclaration.types
+++ b/tests/baselines/reference/optionalParamterAndVariableDeclaration.types
@@ -18,8 +18,8 @@ class C {
 >             : ^^^^^^
 >options : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration2.types b/tests/baselines/reference/optionalParamterAndVariableDeclaration2.types
index 5559febcf7f..d295f0aba8e 100644
--- a/tests/baselines/reference/optionalParamterAndVariableDeclaration2.types
+++ b/tests/baselines/reference/optionalParamterAndVariableDeclaration2.types
@@ -18,8 +18,8 @@ class C {
 >             : ^^^^^^
 >options : number | undefined
 >        : ^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/optionalProperties01.types b/tests/baselines/reference/optionalProperties01.types
index d9648f16643..d0f80c6d11f 100644
--- a/tests/baselines/reference/optionalProperties01.types
+++ b/tests/baselines/reference/optionalProperties01.types
@@ -24,8 +24,8 @@ const foo1 = { required1: "hello" } as Foo;
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >required1 : string
 >          : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 const foo2 = { required1: "hello", optional: "bar" } as Foo;
 >foo2 : Foo
@@ -36,10 +36,10 @@ const foo2 = { required1: "hello", optional: "bar" } as Foo;
 >                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >required1 : string
 >          : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >optional : string
 >         : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/optionalPropertiesTest.types b/tests/baselines/reference/optionalPropertiesTest.types
index bfa33192bb2..4a907bb1ca1 100644
--- a/tests/baselines/reference/optionalPropertiesTest.types
+++ b/tests/baselines/reference/optionalPropertiesTest.types
@@ -40,8 +40,8 @@ foo = { id: 1234 };                // Ok
 >             : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1234 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
 
 foo = { id: 1234, name: "test" };  // Ok
 >foo = { id: 1234, name: "test" } : { id: number; name: string; }
@@ -52,11 +52,11 @@ foo = { id: 1234, name: "test" };  // Ok
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1234 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
 >name : string
 >     : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 foo = { name: "test" };            // Error, id missing
@@ -68,7 +68,7 @@ foo = { name: "test" };            // Error, id missing
 >                 : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
 foo = {id: 1234, print:()=>{}}	   // Ok
@@ -80,8 +80,8 @@ foo = {id: 1234, print:()=>{}}	   // Ok
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->1234 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
 >print : () => void
 >      : ^^^^^^^^^^
 >()=>{} : () => void
@@ -98,8 +98,8 @@ var s = foo.name || "default";
 >    : ^^^^
 >name : string
 >     : ^^^^^^
->"default" : string
->          : ^^^^^^
+>"default" : "default"
+>          : ^^^^^^^^^
 
 if (foo.print !== undefined) foo.print();
 >foo.print !== undefined : boolean
@@ -178,8 +178,8 @@ var test6: i3 = { M: 5 };
 >         : ^^^^^^^^^^^^^^
 >M : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 var test7: i2 = { M: function () { } };
 >test7 : i2
@@ -206,8 +206,8 @@ var test8: i4 = { M: 5 }
 >         : ^^^^^^^^^^^^^^
 >M : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 test8 = {};
 >test8 = {} : {}
diff --git a/tests/baselines/reference/optionalTupleElements1.types b/tests/baselines/reference/optionalTupleElements1.types
index 3dce21386b5..8ace26dacab 100644
--- a/tests/baselines/reference/optionalTupleElements1.types
+++ b/tests/baselines/reference/optionalTupleElements1.types
@@ -197,10 +197,10 @@ t2 = [42, "hello"];
 >   : ^^
 >[42, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 t3 = [42, "hello"];
 >t3 = [42, "hello"] : [number, string]
@@ -209,10 +209,10 @@ t3 = [42, "hello"];
 >   : ^^
 >[42, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 t3 = [42,,true]
 >t3 = [42,,true] : [number, undefined, true]
@@ -221,8 +221,8 @@ t3 = [42,,true]
 >   : ^^
 >[42,,true] : [number, undefined, true]
 >           : ^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 > : undefined
 > : ^^^^^^^^^
 >true : true
@@ -235,8 +235,8 @@ t3 = [42];
 >   : ^^
 >[42] : [number]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 t4 = [42, "hello"];
 >t4 = [42, "hello"] : [number, string]
@@ -245,10 +245,10 @@ t4 = [42, "hello"];
 >   : ^^
 >[42, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 t4 = [42,,true];
 >t4 = [42,,true] : [number, undefined, true]
@@ -257,8 +257,8 @@ t4 = [42,,true];
 >   : ^^
 >[42,,true] : [number, undefined, true]
 >           : ^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 > : undefined
 > : ^^^^^^^^^
 >true : true
@@ -273,8 +273,8 @@ t4 = [,"hello", true];
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
index 194a2cdbe80..38088475c19 100644
--- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
+++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
@@ -64,12 +64,12 @@ v({ s: "", n: 0 }).toLowerCase();
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >toLowerCase : any
 >            : ^^^
 
@@ -94,12 +94,12 @@ w({ s: "", n: 0 }).toLowerCase();
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >n : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >toLowerCase : any
 >            : ^^^
 
diff --git a/tests/baselines/reference/out-flag.types b/tests/baselines/reference/out-flag.types
index 8a03399244d..058787f6811 100644
--- a/tests/baselines/reference/out-flag.types
+++ b/tests/baselines/reference/out-flag.types
@@ -14,8 +14,8 @@ class MyClass
 >      : ^^^^^^      
     {
         return 42;
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 
     public SetCount(value: number)
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.types b/tests/baselines/reference/outFilerootDirModuleNamesAmd.types
index 96482b00ae6..681386ae4d8 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.types
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.types
@@ -32,6 +32,6 @@ export default function foo() { new Foo(); }
 import("./a");
 >import("./a") : Promise<typeof import("src/a")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesSystem.types b/tests/baselines/reference/outFilerootDirModuleNamesSystem.types
index ea4628f2d36..f12adaa06f0 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesSystem.types
+++ b/tests/baselines/reference/outFilerootDirModuleNamesSystem.types
@@ -32,6 +32,6 @@ export default function foo() { new Foo(); }
 import("./a");
 >import("./a") : Promise<typeof import("src/a")>
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a" : string
->      : ^^^^^^
+>"./a" : "./a"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/overload1.types b/tests/baselines/reference/overload1.types
index 9446bb6699e..610004a716b 100644
--- a/tests/baselines/reference/overload1.types
+++ b/tests/baselines/reference/overload1.types
@@ -120,8 +120,8 @@ var y:string=x.f(3); // good
 >  : ^^^
 >f : { (s: string): number; (n: number): string; }
 >  : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 y=x.f("nope"); // can't assign number to string
 >y=x.f("nope") : number
@@ -136,7 +136,7 @@ y=x.f("nope"); // can't assign number to string
 >  : ^^^
 >f : { (s: string): number; (n: number): string; }
 >  : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^
->"nope" : string
+>"nope" : "nope"
 >       : ^^^^^^
 
 var z:string=x.g(x.g(3,3)); // good
@@ -158,10 +158,10 @@ var z:string=x.g(x.g(3,3)); // good
 >  : ^^^
 >g : { (n1: number, n2: number): number; (n: number): string; (a: O.A): O.C; (c: O.C): string; }
 >  : ^^^  ^^      ^^  ^^      ^^^      ^^^ ^^      ^^^      ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^      ^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 z=x.g(2,2,2); // no match
 >z=x.g(2,2,2) : never
@@ -178,8 +178,8 @@ z=x.g(2,2,2); // no match
 >  : ^^^  ^^      ^^  ^^      ^^^      ^^^ ^^      ^^^      ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^      ^^^
 >2 : 2
 >  : ^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >2 : 2
 >  : ^
 
@@ -232,10 +232,10 @@ z=x.h(2,2); // no match
 >  : ^^^
 >h : { (s1: string, s2: number): string; (s1: number, s2: string): number; }
 >  : ^^^  ^^      ^^  ^^      ^^^      ^^^  ^^      ^^  ^^      ^^^      ^^^
->2 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>2 : 2
+>  : ^
 
 z=x.h("hello",0); // good
 >z=x.h("hello",0) : string
@@ -250,10 +250,10 @@ z=x.h("hello",0); // good
 >  : ^^^
 >h : { (s1: string, s2: number): string; (s1: number, s2: string): number; }
 >  : ^^^  ^^      ^^  ^^      ^^^      ^^^  ^^      ^^  ^^      ^^^      ^^^
->"hello" : string
->        : ^^^^^^
->0 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>0 : 0
+>  : ^
 
 var v=x.g;
 >v : { (n1: number, n2: number): number; (n: number): string; (a: O.A): O.C; (c: O.C): string; }
diff --git a/tests/baselines/reference/overloadAssignmentCompat.types b/tests/baselines/reference/overloadAssignmentCompat.types
index 46b5b61e8e1..ee74b126ed7 100644
--- a/tests/baselines/reference/overloadAssignmentCompat.types
+++ b/tests/baselines/reference/overloadAssignmentCompat.types
@@ -108,14 +108,14 @@ function attr2(nameOrMap: any, value?: string): string {
 
         // handle map case
         return "t";
->"t" : string
->    : ^^^^^^
+>"t" : "t"
+>    : ^^^
     }
     else {
         // handle string case
         return "s";
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
     }
 }
 
@@ -127,7 +127,7 @@ function foo():number;
 function foo():string { return "a" };
 >foo : () => number
 >    : ^^^^^^      
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 
diff --git a/tests/baselines/reference/overloadCallTest.types b/tests/baselines/reference/overloadCallTest.types
index d6f9488276d..a2bcd979b7d 100644
--- a/tests/baselines/reference/overloadCallTest.types
+++ b/tests/baselines/reference/overloadCallTest.types
@@ -29,7 +29,7 @@ class foo {
 >bar("test") : any
 >bar : { (): string; (s: string): any; }
 >    : ^^^^^^      ^^^ ^^      ^^^^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
         var goo = bar();
@@ -47,7 +47,7 @@ class foo {
 >bar("test") : any
 >bar : { (): string; (s: string): any; }
 >    : ^^^^^^      ^^^ ^^      ^^^^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
     }
  
diff --git a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types
index a6e1dbed212..bf4a9a587c9 100644
--- a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types
+++ b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types
@@ -35,10 +35,10 @@ ea.publish([1,2,3]);
 >        : ^     ^^      ^^    ^^^   ^^^^^    
 >[1,2,3] : number[]
 >        : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types
index 9bfd414e1bf..dc28aaafe6b 100644
--- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types
+++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types
@@ -10,6 +10,6 @@ var f: (x: 'hi') => number = (x: 'hi') => { return 1; };
 >                           : ^ ^^    ^^^^^^^^^^^
 >x : "hi"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation.types b/tests/baselines/reference/overloadOnConstNoAnyImplementation.types
index b76a8f133c2..dfdb13723b2 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation.types
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation.types
@@ -36,16 +36,16 @@ function x1(a: number, cb: (x: string) => number) {
 >         : ^^^^^^
 >cb : (x: string) => number
 >   : ^ ^^      ^^^^^      
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
     cb('bye');
 >cb('bye') : number
 >          : ^^^^^^
 >cb : (x: string) => number
 >   : ^ ^^      ^^^^^      
->'bye' : string
->      : ^^^^^^
+>'bye' : "bye"
+>      : ^^^^^
 
     var hm = 'hm';
 >hm : string
@@ -66,16 +66,16 @@ function x1(a: number, cb: (x: string) => number) {
 >         : ^^^^^^
 >cb : (x: string) => number
 >   : ^ ^^      ^^^^^      
->'uh' : string
->     : ^^^^^^
+>'uh' : "uh"
+>     : ^^^^
 
     cb(1); // error
 >cb(1) : number
 >      : ^^^^^^
 >cb : (x: string) => number
 >   : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 var cb: (number) => number = (x: number) => 1;
@@ -87,16 +87,16 @@ var cb: (number) => number = (x: number) => 1;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x1(1, cb);
 >x1(1, cb) : any
 >          : ^^^
 >x1 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; }
 >   : ^^^ ^^      ^^  ^^                   ^^^^^^^^^ ^^      ^^  ^^                    ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >cb : (number: any) => number
 >   : ^      ^^^^^^^^^^      
 
@@ -105,26 +105,26 @@ x1(1, (x: 'hi') => 1); // error
 >                      : ^^^
 >x1 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; }
 >   : ^^^ ^^      ^^  ^^                   ^^^^^^^^^ ^^      ^^  ^^                    ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'hi') => 1 : (x: "hi") => number
 >               : ^ ^^    ^^^^^^^^^^^
 >x : "hi"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x1(1, (x: string) => 1);
 >x1(1, (x: string) => 1) : any
 >                        : ^^^
 >x1 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; }
 >   : ^^^ ^^      ^^  ^^                   ^^^^^^^^^ ^^      ^^  ^^                    ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: string) => 1 : (x: string) => number
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
index e56a370420e..f0950110a39 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
@@ -42,16 +42,16 @@ class C {
 >               : ^^^^^^
 >callback : (x: string) => number
 >         : ^ ^^      ^^^^^      
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
         callback('bye');
 >callback('bye') : number
 >                : ^^^^^^
 >callback : (x: string) => number
 >         : ^ ^^      ^^^^^      
->'bye' : string
->      : ^^^^^^
+>'bye' : "bye"
+>      : ^^^^^
 
         var hm = "hm";
 >hm : string
@@ -72,8 +72,8 @@ class C {
 >            : ^^^^^^
 >callback : (x: string) => number
 >         : ^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -90,14 +90,14 @@ c.x1(1, (x: 'hi') => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'hi') => { return 1; } : (x: "hi") => number
 >                           : ^ ^^    ^^^^^^^^^^^
 >x : "hi"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x1(1, (x: 'bye') => { return 1; } );
 >c.x1(1, (x: 'bye') => { return 1; } ) : any
@@ -108,14 +108,14 @@ c.x1(1, (x: 'bye') => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'bye') => { return 1; } : (x: "bye") => number
 >                            : ^ ^^     ^^^^^^^^^^^
 >x : "bye"
 >  : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x1(1, (x) => { return 1; } );
 >c.x1(1, (x) => { return 1; } ) : any
@@ -126,14 +126,14 @@ c.x1(1, (x) => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x) => { return 1; } : (x: "hi") => number
 >                     : ^ ^^^^^^^^^^^^^^^^^
 >x : "hi"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x1(1, (x: number) => { return 1; } );
 >c.x1(1, (x: number) => { return 1; } ) : any
@@ -144,12 +144,12 @@ c.x1(1, (x: number) => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: number) => { return 1; } : (x: number) => number
 >                             : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation.types b/tests/baselines/reference/overloadOnConstNoStringImplementation.types
index cbfce2100bc..b3778388895 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation.types
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation.types
@@ -85,15 +85,15 @@ var cb: (number) => number = (x: number) => 1;
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x2(1, cb); // error
 >x2(1, cb) : any
 >x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; }
 >   : ^^^ ^^      ^^  ^^                   ^^^^^^^^^ ^^      ^^  ^^                    ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >cb : (number: any) => number
 >   : ^      ^^^^^^^^^^      
 
@@ -101,25 +101,25 @@ x2(1, (x: 'hi') => 1); // error
 >x2(1, (x: 'hi') => 1) : any
 >x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; }
 >   : ^^^ ^^      ^^  ^^                   ^^^^^^^^^ ^^      ^^  ^^                    ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'hi') => 1 : (x: "hi") => number
 >               : ^ ^^    ^^^^^^^^^^^
 >x : "hi"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x2(1, (x: string) => 1);
 >x2(1, (x: string) => 1) : any
 >x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; }
 >   : ^^^ ^^      ^^  ^^                   ^^^^^^^^^ ^^      ^^  ^^                    ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: string) => 1 : (x: string) => number
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
index f8d0edba7f3..c8994bf9cab 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
@@ -90,14 +90,14 @@ c.x1(1, (x: 'hi') => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'hi') => { return 1; } : (x: "hi") => number
 >                           : ^ ^^    ^^^^^^^^^^^
 >x : "hi"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x1(1, (x: 'bye') => { return 1; } ); 
 >c.x1(1, (x: 'bye') => { return 1; } ) : any
@@ -108,14 +108,14 @@ c.x1(1, (x: 'bye') => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'bye') => { return 1; } : (x: "bye") => number
 >                            : ^ ^^     ^^^^^^^^^^^
 >x : "bye"
 >  : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x1(1, (x: string) => { return 1; } );
 >c.x1(1, (x: string) => { return 1; } ) : any
@@ -126,14 +126,14 @@ c.x1(1, (x: string) => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: string) => { return 1; } : (x: string) => number
 >                             : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 c.x1(1, (x: number) => { return 1; } );
 >c.x1(1, (x: number) => { return 1; } ) : any
@@ -144,12 +144,12 @@ c.x1(1, (x: number) => { return 1; } );
 >  : ^
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >   : ^ ^^      ^^        ^^                   ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: number) => { return 1; } : (x: number) => number
 >                             : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/overloadResolution.types b/tests/baselines/reference/overloadResolution.types
index f4603de8fe0..5b865a8f576 100644
--- a/tests/baselines/reference/overloadResolution.types
+++ b/tests/baselines/reference/overloadResolution.types
@@ -116,8 +116,8 @@ var d = fn2<Date>(0, undefined);
 >                        : ^^^^
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
 >    : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^ ^^      ^^ ^^ ^^^ ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -133,8 +133,8 @@ var s = fn2(0, '');
 >           : ^^
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
 >    : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^ ^^      ^^ ^^ ^^^ ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -144,10 +144,10 @@ fn2<Date>('', 0); // Error
 >                 : ^^^^^^
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
 >    : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^ ^^      ^^ ^^ ^^^ ^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic and non - generic overload where non - generic overload is the only candidate when called without type arguments
 fn2('', 0); // OK
@@ -155,10 +155,10 @@ fn2('', 0); // OK
 >           : ^^^^^^
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
 >    : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^ ^^      ^^ ^^ ^^^ ^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic overloads with differing arity called without type arguments
 function fn3<T>(n: T): string;
@@ -198,8 +198,8 @@ var s = fn3(3);
 >       : ^^^^^^
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
 >    : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var s = fn3('', 3, '');
 >s : string
@@ -208,10 +208,10 @@ var s = fn3('', 3, '');
 >               : ^^
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
 >    : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -222,12 +222,12 @@ var n = fn3(5, 5, 5);
 >             : ^^^^^^
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
 >    : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 var n: number;
 >n : number
@@ -241,8 +241,8 @@ var s = fn3<number>(4);
 >               : ^^^^^^
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
 >    : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var s = fn3<string, string>('', '', '');
 >s : string
@@ -251,12 +251,12 @@ var s = fn3<string, string>('', '', '');
 >                                : ^^^^^^
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
 >    : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 var n = fn3<number, string, string>('', '', 3);
 >n : number
@@ -265,12 +265,12 @@ var n = fn3<number, string, string>('', '', 3);
 >                                       : ^^^^^^
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
 >    : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 // Generic overloads with differing arity called with type argument count that doesn't match any overload
 fn3<number, number, number, number>(); // Error
@@ -305,40 +305,40 @@ fn4<string, number>('', 3);
 >                           : ^^^
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
 >    : ^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 fn4<string, number>(3, ''); // Error
 >fn4<string, number>(3, '') : any
 >                           : ^^^
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
 >    : ^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 fn4<number, string>('', 3); // Error
 >fn4<number, string>('', 3) : any
 >                           : ^^^
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
 >    : ^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 fn4<number, string>(3, ''); 
 >fn4<number, string>(3, '') : any
 >                           : ^^^
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
 >    : ^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^ ^^^^^^^^^      ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^^^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 // Generic overloads with constraints called without type arguments but with types that satisfy the constraints
 fn4('', 3);
@@ -465,7 +465,7 @@ var s = fn5((n) => n.substr(0));
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
diff --git a/tests/baselines/reference/overloadResolutionClassConstructors.types b/tests/baselines/reference/overloadResolutionClassConstructors.types
index 28bee33be9e..9d542b036f5 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.types
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.types
@@ -105,8 +105,8 @@ var d = new fn2<Date>(0, undefined);
 >                            : ^^^^^^^^^
 >fn2 : typeof fn2
 >    : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -118,10 +118,10 @@ var s = new fn2(0, '');
 >               : ^^^^^^^^^^^
 >fn2 : typeof fn2
 >    : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>0 : 0
+>  : ^
+>'' : ""
+>   : ^^
 
 // Generic and non - generic overload where non - generic overload is the only candidate when called with type arguments
 new fn2<Date>('', 0); // OK
@@ -129,10 +129,10 @@ new fn2<Date>('', 0); // OK
 >                     : ^^^^^^^^^
 >fn2 : typeof fn2
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic and non - generic overload where non - generic overload is the only candidate when called without type arguments
 new fn2('', 0); // OK
@@ -140,10 +140,10 @@ new fn2('', 0); // OK
 >               : ^^^^^^^^^^^^
 >fn2 : typeof fn2
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic overloads with differing arity called without type arguments
 class fn3<T, U, V> {
@@ -178,32 +178,32 @@ new fn3(3);
 >           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fn3 : typeof fn3
 >    : ^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 new fn3('', 3, '');
 >new fn3('', 3, '') : fn3<number, string, unknown>
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fn3 : typeof fn3
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 new fn3(5, 5, 5);
 >new fn3(5, 5, 5) : fn3<number, number, number>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fn3 : typeof fn3
 >    : ^^^^^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 // Generic overloads with differing arity called with type arguments matching each overload type parameter count
 new fn3<number>(4); // Error
@@ -211,32 +211,32 @@ new fn3<number>(4); // Error
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fn3 : typeof fn3
 >    : ^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 new fn3<string, string>('', '', '');  // Error
 >new fn3<string, string>('', '', '') : fn3<string, string, unknown>
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fn3 : typeof fn3
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 new fn3<number, string, string>('', '', 3);
 >new fn3<number, string, string>('', '', 3) : fn3<number, string, string>
 >                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fn3 : typeof fn3
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 // Generic overloads with differing arity called with type argument count that doesn't match any overload
 new fn3<number, number, number, number>(); // Error
@@ -263,40 +263,40 @@ new fn4<string, number>('', 3);
 >                               : ^^^^^^^^^^^^^^^^^^^
 >fn4 : typeof fn4
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new fn4<string, number>(3, ''); // Error
 >new fn4<string, number>(3, '') : fn4<string, number>
 >                               : ^^^^^^^^^^^^^^^^^^^
 >fn4 : typeof fn4
 >    : ^^^^^^^^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 new fn4<number, string>('', 3); // Error
 >new fn4<number, string>('', 3) : fn4<number, string>
 >                               : ^^^^^^^^^^^^^^^^^^^
 >fn4 : typeof fn4
 >    : ^^^^^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new fn4<number, string>(3, ''); // Error
 >new fn4<number, string>(3, '') : fn4<number, string>
 >                               : ^^^^^^^^^^^^^^^^^^^
 >fn4 : typeof fn4
 >    : ^^^^^^^^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 // Generic overloads with constraints called without type arguments but with types that satisfy the constraints
 new fn4('', 3);
@@ -314,18 +314,18 @@ new fn4(3, ''); // Error
 >               : ^^^^^^^^^^^^^^^^^^^
 >fn4 : typeof fn4
 >    : ^^^^^^^^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 new fn4(3, undefined); // Error
 >new fn4(3, undefined) : fn4<string, any>
 >                      : ^^^^^^^^^^^^^^^^
 >fn4 : typeof fn4
 >    : ^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -417,8 +417,8 @@ new fn5((n) => n.substr(0));
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 new fn5((n) => n.blah); // Error
 >new fn5((n) => n.blah) : fn5
diff --git a/tests/baselines/reference/overloadResolutionConstructors.types b/tests/baselines/reference/overloadResolutionConstructors.types
index 7d4e49ff683..5b6ab01d635 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.types
+++ b/tests/baselines/reference/overloadResolutionConstructors.types
@@ -106,8 +106,8 @@ var d = new fn2<Date>(0, undefined);
 >                            : ^^^^
 >fn2 : fn2
 >    : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -123,8 +123,8 @@ var s = new fn2(0, '');
 >               : ^^
 >fn2 : fn2
 >    : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -134,10 +134,10 @@ new fn2<Date>('', 0); // Error
 >                     : ^^^^^^
 >fn2 : fn2
 >    : ^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic and non - generic overload where non - generic overload is the only candidate when called without type arguments
 new fn2('', 0); // OK
@@ -145,10 +145,10 @@ new fn2('', 0); // OK
 >               : ^^^^^^
 >fn2 : fn2
 >    : ^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic overloads with differing arity called without type arguments
 interface fn3 {
@@ -183,8 +183,8 @@ var s = new fn3(3);
 >           : ^^^^^^
 >fn3 : fn3
 >    : ^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var s = new fn3('', 3, '');
 >s : string
@@ -193,10 +193,10 @@ var s = new fn3('', 3, '');
 >                   : ^^
 >fn3 : fn3
 >    : ^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -207,12 +207,12 @@ var n = new fn3(5, 5, 5);
 >                 : ^^^^^^
 >fn3 : fn3
 >    : ^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 var n: number;
 >n : number
@@ -226,8 +226,8 @@ var s = new fn3<number>(4);
 >                   : ^^^^^^
 >fn3 : fn3
 >    : ^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var s = new fn3<string, string>('', '', '');
 >s : string
@@ -236,12 +236,12 @@ var s = new fn3<string, string>('', '', '');
 >                                    : ^^^^^^
 >fn3 : fn3
 >    : ^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 
 var n = new fn3<number, string, string>('', '', 3);
 >n : number
@@ -250,12 +250,12 @@ var n = new fn3<number, string, string>('', '', 3);
 >                                           : ^^^^^^
 >fn3 : fn3
 >    : ^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 // Generic overloads with differing arity called with type argument count that doesn't match any overload
 new fn3<number, number, number, number>(); // Error
@@ -287,40 +287,40 @@ new fn4<string, number>('', 3);
 >                               : ^^^
 >fn4 : fn4
 >    : ^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new fn4<string, number>(3, ''); // Error
 >new fn4<string, number>(3, '') : any
 >                               : ^^^
 >fn4 : fn4
 >    : ^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 new fn4<number, string>('', 3); // Error
 >new fn4<number, string>('', 3) : any
 >                               : ^^^
 >fn4 : fn4
 >    : ^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 
 new fn4<number, string>(3, ''); 
 >new fn4<number, string>(3, '') : any
 >                               : ^^^
 >fn4 : fn4
 >    : ^^^
->3 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>3 : 3
+>  : ^
+>'' : ""
+>   : ^^
 
 // Generic overloads with constraints called without type arguments but with types that satisfy the constraints
 new fn4('', 3);
@@ -442,6 +442,6 @@ var s = new fn5((n) => n.substr(0));
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
index c2bf28d452d..1543da64f14 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
@@ -88,8 +88,8 @@ function bug3(f:(x:string)=>string) { return f("s") }
 >       : ^^^^^^
 >f : (x: string) => string
 >  : ^ ^^      ^^^^^      
->"s" : string
->    : ^^^^^^
+>"s" : "s"
+>    : ^^^
 
 function fprime(x:string):string { return x; }
 >fprime : (x: string) => string
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
index f50c144b9f5..70f803ce6b1 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -55,16 +55,16 @@ module Bugs {
 >                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >startIndex : number
 >           : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >type : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >bracket : number
 >        : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
                                 tokens.push(<IToken>({ startIndex: 1, type: '', bracket: 3, state: null, length: 10 }));
 >tokens.push(<IToken>({ startIndex: 1, type: '', bracket: 3, state: null, length: 10 })) : number
@@ -83,16 +83,16 @@ module Bugs {
 >                                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >startIndex : number
 >           : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >type : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >bracket : number
 >        : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >state : null
 >      : ^^^^
 >length : number
diff --git a/tests/baselines/reference/overloadResolutionTest1.types b/tests/baselines/reference/overloadResolutionTest1.types
index 4ed799df51f..5b9f0714d1a 100644
--- a/tests/baselines/reference/overloadResolutionTest1.types
+++ b/tests/baselines/reference/overloadResolutionTest1.types
@@ -56,8 +56,8 @@ var x11 = foo([{a:0}]); // works
 >      : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var x111 = foo([{a:"s"}]); // error - does not match any signature
 >x111 : never
@@ -128,8 +128,8 @@ var x2 = foo2({a:0}); // works
 >      : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var x3 = foo2({a:true}); // works
 >x3 : number
diff --git a/tests/baselines/reference/overloadResolutionWithAny.types b/tests/baselines/reference/overloadResolutionWithAny.types
index 1ce6677709c..66e5881c7a4 100644
--- a/tests/baselines/reference/overloadResolutionWithAny.types
+++ b/tests/baselines/reference/overloadResolutionWithAny.types
@@ -19,8 +19,8 @@ func(""); // number
 >         : ^^^^^^
 >func : { (s: string): number; (s: any): string; }
 >     : ^^^ ^^      ^^^      ^^^ ^^   ^^^      ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 func(3); // string
 >func(3) : string
@@ -78,10 +78,10 @@ func2("", ""); // number
 >              : ^^^^^^
 >func2 : { (s: string, t: string): number; (s: any, t: string): boolean; (s: string, t: any): RegExp; (s: any, t: any): string; }
 >      : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^   ^^ ^^      ^^^       ^^^ ^^      ^^ ^^   ^^^      ^^^ ^^   ^^ ^^   ^^^      ^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
 func2(x, ""); // boolean
 >func2(x, "") : boolean
@@ -89,15 +89,15 @@ func2(x, ""); // boolean
 >func2 : { (s: string, t: string): number; (s: any, t: string): boolean; (s: string, t: any): RegExp; (s: any, t: any): string; }
 >      : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^   ^^ ^^      ^^^       ^^^ ^^      ^^ ^^   ^^^      ^^^ ^^   ^^ ^^   ^^^      ^^^
 >x : any
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 func2("", x); // RegExp
 >func2("", x) : RegExp
 >             : ^^^^^^
 >func2 : { (s: string, t: string): number; (s: any, t: string): boolean; (s: string, t: any): RegExp; (s: any, t: any): string; }
 >      : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^   ^^ ^^      ^^^       ^^^ ^^      ^^ ^^   ^^^      ^^^ ^^   ^^ ^^   ^^^      ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >x : any
 
diff --git a/tests/baselines/reference/overloadTag1.types b/tests/baselines/reference/overloadTag1.types
index e9fa302c79d..c31f5dc42a7 100644
--- a/tests/baselines/reference/overloadTag1.types
+++ b/tests/baselines/reference/overloadTag1.types
@@ -85,8 +85,8 @@ export function overloaded(a,b) {
 >                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Invalid arguments" : string
->                    : ^^^^^^
+>"Invalid arguments" : "Invalid arguments"
+>                    : ^^^^^^^^^^^^^^^^^^^
 }
 var o1 = overloaded(1,2)
 >o1 : number
@@ -95,10 +95,10 @@ var o1 = overloaded(1,2)
 >                : ^^^^^^
 >overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >           : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^      ^^ ^^       ^^^      ^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var o2 = overloaded("zero", "one")
 >o2 : never
@@ -107,7 +107,7 @@ var o2 = overloaded("zero", "one")
 >                          : ^^^^^
 >overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >           : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^      ^^ ^^       ^^^      ^^^
->"zero" : string
+>"zero" : "zero"
 >       : ^^^^^^
 >"one" : "one"
 >      : ^^^^^
@@ -119,8 +119,8 @@ var o3 = overloaded("a",false)
 >                      : ^^^^^^
 >overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >           : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^      ^^ ^^       ^^^      ^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 >false : false
 >      : ^^^^^
 
@@ -156,17 +156,17 @@ uncheckedInternally(1,2)
 >                         : ^^^^^^
 >uncheckedInternally : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >                    : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^      ^^ ^^       ^^^      ^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 uncheckedInternally("zero", "one")
 >uncheckedInternally("zero", "one") : never
 >                                   : ^^^^^
 >uncheckedInternally : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >                    : ^^^ ^^      ^^ ^^      ^^^      ^^^ ^^      ^^ ^^       ^^^      ^^^
->"zero" : string
+>"zero" : "zero"
 >       : ^^^^^^
 >"one" : "one"
 >      : ^^^^^
diff --git a/tests/baselines/reference/overloadTag2.types b/tests/baselines/reference/overloadTag2.types
index 8f89d35771c..6d5537d6a8f 100644
--- a/tests/baselines/reference/overloadTag2.types
+++ b/tests/baselines/reference/overloadTag2.types
@@ -83,8 +83,8 @@ var b = new Foo('str')
 >               : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->'str' : string
->      : ^^^^^^
+>'str' : "str"
+>      : ^^^^^
 
 var c = new Foo(2)
 >c : Foo
@@ -93,8 +93,8 @@ var c = new Foo(2)
 >           : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var d = new Foo('str', 2)
 >d : Foo
@@ -103,8 +103,8 @@ var d = new Foo('str', 2)
 >                  : ^^^
 >Foo : typeof Foo
 >    : ^^^^^^^^^^
->'str' : string
->      : ^^^^^^
->2 : number
->  : ^^^^^^
+>'str' : "str"
+>      : ^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
index 8da0da2f093..ee73e0bf05f 100644
--- a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
+++ b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
@@ -30,8 +30,8 @@ x2(() => 1);
 >   : ^^^        ^^                      ^^^^^^^^^        ^^                     ^^^^^^^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x2((x) => 1 );
 >x2((x) => 1 ) : any
@@ -41,6 +41,6 @@ x2((x) => 1 );
 >         : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/overloadingOnConstants1.types b/tests/baselines/reference/overloadingOnConstants1.types
index 5b4b2634ece..d5eaa38fcc3 100644
--- a/tests/baselines/reference/overloadingOnConstants1.types
+++ b/tests/baselines/reference/overloadingOnConstants1.types
@@ -73,8 +73,8 @@ var htmlElement: Base = d2.createElement("yo")
 >   : ^^^^^^^^^
 >createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >              : ^^^       ^^        ^^^        ^^^       ^^     ^^^        ^^^       ^^      ^^^        ^^^       ^^      ^^^    ^^^
->"yo" : string
->     : ^^^^^^
+>"yo" : "yo"
+>     : ^^^^
 
 var htmlCanvasElement: Derived1 = d2.createElement("canvas");
 >htmlCanvasElement : Derived1
@@ -130,8 +130,8 @@ var htmlElement2: Derived1 = d2.createElement("yo")
 >   : ^^^^^^^^^
 >createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >              : ^^^       ^^        ^^^        ^^^       ^^     ^^^        ^^^       ^^      ^^^        ^^^       ^^      ^^^    ^^^
->"yo" : string
->     : ^^^^^^
+>"yo" : "yo"
+>     : ^^^^
 
 var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
 >htmlCanvasElement2 : Derived3
diff --git a/tests/baselines/reference/overloadingOnConstants2.types b/tests/baselines/reference/overloadingOnConstants2.types
index 46e9b0114b7..bcb5e6eb3aa 100644
--- a/tests/baselines/reference/overloadingOnConstants2.types
+++ b/tests/baselines/reference/overloadingOnConstants2.types
@@ -125,8 +125,8 @@ var d: D = bar("hi", []); // D
 >              : ^
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >    : ^^^ ^^     ^^     ^^        ^^^ ^^^ ^^      ^^     ^^        ^^^ ^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
@@ -149,8 +149,8 @@ var f: C = bar("um", []); // C
 >              : ^
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >    : ^^^ ^^     ^^     ^^        ^^^ ^^^ ^^      ^^     ^^        ^^^ ^^^
->"um" : string
->     : ^^^^^^
+>"um" : "um"
+>     : ^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArity.types b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
index ac6b32a235d..b0c045c8e3c 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArity.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
@@ -30,13 +30,13 @@ Callbacks<number, string, boolean>('s'); // no error
 >                                        : ^^^^
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
 >          : ^^^     ^^^      ^^^    ^^^ ^^     ^^^      ^^^    ^^^  ^^  ^^     ^^^      ^^^    ^^^  ^^  ^^  ^^     ^^^      ^^^    ^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
 new Callbacks<number, string, boolean>('s'); // no error
 >new Callbacks<number, string, boolean>('s') : any
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
 >          : ^^^     ^^^      ^^^    ^^^ ^^     ^^^      ^^^    ^^^  ^^  ^^     ^^^      ^^^    ^^^  ^^  ^^  ^^     ^^^      ^^^    ^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types
index 9c27383cd56..ae44e85c344 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types
@@ -24,16 +24,16 @@ Callbacks<number, string, boolean>('s'); // wrong number of type arguments
 >                                        : ^^^^
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; }
 >          : ^^^     ^^^      ^^^    ^^^ ^^     ^^^      ^^^    ^^^  ^^  ^^     ^^^      ^^^    ^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
 new Callbacks<number, string, boolean>('s'); // wrong number of type arguments
 >new Callbacks<number, string, boolean>('s') : any
 >                                            : ^^^
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; }
 >          : ^^^     ^^^      ^^^    ^^^ ^^     ^^^      ^^^    ^^^  ^^  ^^     ^^^      ^^^    ^^^
->'s' : string
->    : ^^^^^^
+>'s' : "s"
+>    : ^^^
 
 declare function f<A, B = {}>(arg: number): void;
 >f : <A, B = {}>(arg: number) => void
diff --git a/tests/baselines/reference/overloadsWithComputedNames.types b/tests/baselines/reference/overloadsWithComputedNames.types
index bc965581c51..b85d49a7290 100644
--- a/tests/baselines/reference/overloadsWithComputedNames.types
+++ b/tests/baselines/reference/overloadsWithComputedNames.types
@@ -23,8 +23,8 @@ class Person {
 >  : ^^^^^^^^^^^^^^^
 
       return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 let p = new Person();
@@ -44,8 +44,8 @@ p.A(0)
 >  : ^^^^^^
 >A : (a: string | number) => number | string
 >  : ^ ^^               ^^^^^               
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 p.B(0)
 >p.B(0) : string
@@ -56,8 +56,8 @@ p.B(0)
 >  : ^^^^^^
 >B : (a: number) => string
 >  : ^ ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // https://github.com/microsoft/TypeScript/issues/17345
 class C {
diff --git a/tests/baselines/reference/overloadsWithConstraints.types b/tests/baselines/reference/overloadsWithConstraints.types
index b8408050c85..f3a8058ccc0 100644
--- a/tests/baselines/reference/overloadsWithConstraints.types
+++ b/tests/baselines/reference/overloadsWithConstraints.types
@@ -20,6 +20,6 @@ var v = f<string>("");
 >              : ^^^^^^
 >f : { <T extends Number>(x: T): T; <T extends String>(x: T): T; }
 >  : ^^^ ^^^^^^^^^      ^^ ^^ ^^^ ^^^ ^^^^^^^^^      ^^ ^^ ^^^ ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.types b/tests/baselines/reference/overloadsWithProvisionalErrors.types
index b327c265235..669e5c332e1 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.types
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.types
@@ -54,8 +54,8 @@ func(s => ({ a: blah, b: 3 })); // Only error inside the function, but not outsi
 >     : ^^^
 >b : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 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
 >func(s => ({ a: blah })) : never
diff --git a/tests/baselines/reference/override12(target=es2015).types b/tests/baselines/reference/override12(target=es2015).types
index 8b72752e4fd..f47a0367546 100644
--- a/tests/baselines/reference/override12(target=es2015).types
+++ b/tests/baselines/reference/override12(target=es2015).types
@@ -10,8 +10,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m2(): number {
@@ -19,8 +19,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m3(): void {}
@@ -48,8 +48,8 @@ class B extends A {
 >   : ^^^^^^      
 
         return 30;
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
     }
 
     override m3(): void {}
diff --git a/tests/baselines/reference/override12(target=esnext).types b/tests/baselines/reference/override12(target=esnext).types
index 8b72752e4fd..f47a0367546 100644
--- a/tests/baselines/reference/override12(target=esnext).types
+++ b/tests/baselines/reference/override12(target=esnext).types
@@ -10,8 +10,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m2(): number {
@@ -19,8 +19,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m3(): void {}
@@ -48,8 +48,8 @@ class B extends A {
 >   : ^^^^^^      
 
         return 30;
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
     }
 
     override m3(): void {}
diff --git a/tests/baselines/reference/override17(target=es2015).types b/tests/baselines/reference/override17(target=es2015).types
index 687c6cab7be..a03efd4c126 100644
--- a/tests/baselines/reference/override17(target=es2015).types
+++ b/tests/baselines/reference/override17(target=es2015).types
@@ -10,8 +10,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m2(): number {
@@ -19,8 +19,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m3(): void {}
@@ -48,8 +48,8 @@ class B extends A {
 >   : ^^^^^^      
 
         return 30;
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
     }
 
     override m3(): void {}
diff --git a/tests/baselines/reference/override17(target=esnext).types b/tests/baselines/reference/override17(target=esnext).types
index 687c6cab7be..a03efd4c126 100644
--- a/tests/baselines/reference/override17(target=esnext).types
+++ b/tests/baselines/reference/override17(target=esnext).types
@@ -10,8 +10,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m2(): number {
@@ -19,8 +19,8 @@ class A {
 >   : ^^^^^^      
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     public m3(): void {}
@@ -48,8 +48,8 @@ class B extends A {
 >   : ^^^^^^      
 
         return 30;
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
     }
 
     override m3(): void {}
diff --git a/tests/baselines/reference/override4.types b/tests/baselines/reference/override4.types
index e156d653c76..046dfae968f 100644
--- a/tests/baselines/reference/override4.types
+++ b/tests/baselines/reference/override4.types
@@ -8,14 +8,14 @@ class B {
     p1: number = 1;
 >p1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     p2: number = 1;
 >p2 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     p3: () => void;
 >p3 : () => void
@@ -47,14 +47,14 @@ class D extends B {
     p1: number = 2;
 >p1 : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     override p2: number = 3;
 >p2 : number
 >   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     p3: () => void;
 >p3 : () => void
diff --git a/tests/baselines/reference/override5.types b/tests/baselines/reference/override5.types
index b865d6511d8..76e624db8ad 100644
--- a/tests/baselines/reference/override5.types
+++ b/tests/baselines/reference/override5.types
@@ -8,26 +8,26 @@ class B {
     p1: number = 1;
 >p1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     p2: number = 2;
 >p2 : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     p3: number = 3;
 >p3 : number
 >   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     p4: number = 4;
 >p4 : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
     oop: number;
 >oop : number
diff --git a/tests/baselines/reference/override6.types b/tests/baselines/reference/override6.types
index e8668f2ceff..5921ba02c05 100644
--- a/tests/baselines/reference/override6.types
+++ b/tests/baselines/reference/override6.types
@@ -8,8 +8,8 @@ class B {
     public baz: number = 1;
 >baz : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     constructor(public foo: string, public bar: number) {
 >foo : string
@@ -29,8 +29,8 @@ class D extends B {
     public bar: number = 1
 >bar : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     constructor(public foo: string, public baz: number) {
 >foo : string
@@ -45,8 +45,8 @@ class D extends B {
 >      : ^^^^^^^^
 >foo : string
 >    : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/override7.types b/tests/baselines/reference/override7.types
index fe725af6977..199d649dd08 100644
--- a/tests/baselines/reference/override7.types
+++ b/tests/baselines/reference/override7.types
@@ -8,26 +8,26 @@ class B {
     p1: number = 1;
 >p1 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     p2: number = 2;
 >p2 : number
 >   : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     p3: number = 3;
 >p3 : number
 >   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     p4: number = 4;
 >p4 : number
 >   : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 }
 
 class D extends B{
diff --git a/tests/baselines/reference/overrideBaseIntersectionMethod.types b/tests/baselines/reference/overrideBaseIntersectionMethod.types
index 85546a794e8..672cc21411e 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.types
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.types
@@ -82,10 +82,10 @@ class Point {
     return [0,0];
 >[0,0] : [number, number]
 >      : ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/paramTagBracketsAddOptionalUndefined.types b/tests/baselines/reference/paramTagBracketsAddOptionalUndefined.types
index 9a8f3ba77c6..b47f13a4e48 100644
--- a/tests/baselines/reference/paramTagBracketsAddOptionalUndefined.types
+++ b/tests/baselines/reference/paramTagBracketsAddOptionalUndefined.types
@@ -65,10 +65,10 @@ f(1, 2, 3)
 >           : ^^^^
 >f : (p?: number | undefined, q?: number | undefined, r?: number | undefined) => void
 >  : ^ ^^^^^^^^^^^^^^^^^^^^^^^ ^^^         ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/paramTagOnCallExpression.types b/tests/baselines/reference/paramTagOnCallExpression.types
index 221cd36f0d3..9910b0b0545 100644
--- a/tests/baselines/reference/paramTagOnCallExpression.types
+++ b/tests/baselines/reference/paramTagOnCallExpression.types
@@ -23,6 +23,6 @@ exports.inherits = factory('inherits')
 >                    : ^^
 >factory : (type: string) => {}
 >        : ^    ^^      ^^^^^  
->'inherits' : string
->           : ^^^^^^
+>'inherits' : "inherits"
+>           : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/paramTagOnFunctionUsingArguments.types b/tests/baselines/reference/paramTagOnFunctionUsingArguments.types
index 55e35583f62..1d9a51a20cb 100644
--- a/tests/baselines/reference/paramTagOnFunctionUsingArguments.types
+++ b/tests/baselines/reference/paramTagOnFunctionUsingArguments.types
@@ -79,10 +79,10 @@ correct(1,2,3) // oh no
 >               : ^^^^
 >correct : (...args: string[]) => void
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/paramTagTypeResolution.types b/tests/baselines/reference/paramTagTypeResolution.types
index 758bf1f7850..51591c439a7 100644
--- a/tests/baselines/reference/paramTagTypeResolution.types
+++ b/tests/baselines/reference/paramTagTypeResolution.types
@@ -15,8 +15,8 @@ f(1, n => { })
 >               : ^^^^
 >f : <T>(x: T, k: (t: T) => void) => void
 >  : ^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >n => { } : (n: number) => void
 >         : ^ ^^^^^^^^^^^^^^^^^
 >n : number
diff --git a/tests/baselines/reference/paramTagTypeResolution2.types b/tests/baselines/reference/paramTagTypeResolution2.types
index c7fd544b69f..230fdd153ee 100644
--- a/tests/baselines/reference/paramTagTypeResolution2.types
+++ b/tests/baselines/reference/paramTagTypeResolution2.types
@@ -24,8 +24,8 @@ f({ x: 42 }, { x(param) { param.toFixed() } });
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >{ x(param) { param.toFixed() } } : { x(param: number): void; }
 >                                 : ^^^^     ^^^^^^^^^^^^^^^^^^
 >x : (param: number) => void
diff --git a/tests/baselines/reference/paramTagWrapping.types b/tests/baselines/reference/paramTagWrapping.types
index 11ceb7098c1..d928d689927 100644
--- a/tests/baselines/reference/paramTagWrapping.types
+++ b/tests/baselines/reference/paramTagWrapping.types
@@ -25,12 +25,12 @@ good(1, 2, 3)
 >              : ^^^^
 >good : (x: number, y: number, z: number) => void
 >     : ^ ^^      ^^ ^^      ^^ ^^      ^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 
 === bad.js ===
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing1.types b/tests/baselines/reference/parameterInitializersForwardReferencing1.types
index 0d8a5df32a7..48f7f07c1ca 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing1.types
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing1.types
@@ -4,8 +4,8 @@
 let foo: string = "";
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 function f1 (bar = foo) { // unexpected compiler error; works at runtime
 >f1 : (bar?: number) => number
@@ -18,8 +18,8 @@ function f1 (bar = foo) { // unexpected compiler error; works at runtime
     var foo: number = 2;
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     return bar; // returns 1
 >bar : number
@@ -43,8 +43,8 @@ function f2 (bar = (baz = foo) => baz) { // unexpected compiler error; works at
     var foo: number = 2;
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     return bar(); // returns 1
 >bar() : number
@@ -122,8 +122,8 @@ function f7({[foo]: bar}: any[]) {
     let foo: number = 2;
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 
 class Foo {
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing1_es6.types b/tests/baselines/reference/parameterInitializersForwardReferencing1_es6.types
index a1691bc7a1f..5ec0f47f3c7 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing1_es6.types
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing1_es6.types
@@ -4,8 +4,8 @@
 let foo: string = "";
 >foo : string
 >    : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 function f1 (bar = foo) { // unexpected compiler error; works at runtime
 >f1 : (bar?: string) => string
@@ -18,8 +18,8 @@ function f1 (bar = foo) { // unexpected compiler error; works at runtime
     var foo: number = 2;
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     return bar; // returns 1
 >bar : string
@@ -43,8 +43,8 @@ function f2 (bar = (baz = foo) => baz) { // unexpected compiler error; works at
     var foo: number = 2;
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     return bar(); // returns 1
 >bar() : string
@@ -122,8 +122,8 @@ function f7({[foo]: bar}: any[]) {
     let foo: number = 2;
 >foo : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 
 class Foo {
diff --git a/tests/baselines/reference/parameterListAsTupleType.types b/tests/baselines/reference/parameterListAsTupleType.types
index c08d14521fa..f3fea29fd90 100644
--- a/tests/baselines/reference/parameterListAsTupleType.types
+++ b/tests/baselines/reference/parameterListAsTupleType.types
@@ -40,8 +40,8 @@ const a: Xps = ['should-not-work']; // works, but shouldn't
 >  : ^^^^^^^^^^^
 >['should-not-work'] : [string]
 >                    : ^^^^^^^^
->'should-not-work' : string
->                  : ^^^^^^
+>'should-not-work' : "should-not-work"
+>                  : ^^^^^^^^^^^^^^^^^
 
 function t(...args: Xps) {} // should work
 >t : (a: number) => void
diff --git a/tests/baselines/reference/paramsOnlyHaveLiteralTypesWhenAppropriatelyContextualized.types b/tests/baselines/reference/paramsOnlyHaveLiteralTypesWhenAppropriatelyContextualized.types
index da1eed36695..57159758c59 100644
--- a/tests/baselines/reference/paramsOnlyHaveLiteralTypesWhenAppropriatelyContextualized.types
+++ b/tests/baselines/reference/paramsOnlyHaveLiteralTypesWhenAppropriatelyContextualized.types
@@ -92,8 +92,8 @@ appendToOptionalArray(foo, 'x', 123);   // ok
 >    : ^^^^^^        ^^^^^^        ^^^
 >'x' : "x"
 >    : ^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 appendToOptionalArray(foo, 'y', 'bar'); // ok
 >appendToOptionalArray(foo, 'y', 'bar') : void
@@ -104,8 +104,8 @@ appendToOptionalArray(foo, 'y', 'bar'); // ok
 >    : ^^^^^^        ^^^^^^        ^^^
 >'y' : "y"
 >    : ^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 appendToOptionalArray(foo, 'y', 12);    // should fail
 >appendToOptionalArray(foo, 'y', 12) : void
@@ -116,8 +116,8 @@ appendToOptionalArray(foo, 'y', 12);    // should fail
 >    : ^^^^^^        ^^^^^^        ^^^
 >'y' : "y"
 >    : ^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 appendToOptionalArray(foo, 'x', "no");  // should fail
 >appendToOptionalArray(foo, 'x', "no") : void
@@ -128,6 +128,6 @@ appendToOptionalArray(foo, 'x', "no");  // should fail
 >    : ^^^^^^        ^^^^^^        ^^^
 >'x' : "x"
 >    : ^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/parenthesizedContexualTyping1.types b/tests/baselines/reference/parenthesizedContexualTyping1.types
index 9dbe5d08f0b..4dbdd3324df 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping1.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping1.types
@@ -57,8 +57,8 @@ var a = fun(x => x, 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var b = fun((x => x), 10);
 >b : number
@@ -75,8 +75,8 @@ var b = fun((x => x), 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c = fun(((x => x)), 10);
 >c : number
@@ -95,8 +95,8 @@ var c = fun(((x => x)), 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var d = fun((((x => x))), 10);
 >d : number
@@ -117,8 +117,8 @@ var d = fun((((x => x))), 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var e = fun(x => x, x => x, 10);
 >e : number
@@ -139,8 +139,8 @@ var e = fun(x => x, x => x, 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var f = fun((x => x), (x => x), 10);
 >f : number
@@ -165,8 +165,8 @@ var f = fun((x => x), (x => x), 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var g = fun(((x => x)), ((x => x)), 10);
 >g : number
@@ -195,8 +195,8 @@ var g = fun(((x => x)), ((x => x)), 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var h = fun((((x => x))), ((x => x)), 10);
 >h : number
@@ -227,8 +227,8 @@ var h = fun((((x => x))), ((x => x)), 10);
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 // Ternaries in parens
 var i = fun((Math.random() < 0.5 ? x => x : x => undefined), 10);
diff --git a/tests/baselines/reference/parenthesizedContexualTyping3.types b/tests/baselines/reference/parenthesizedContexualTyping3.types
index 8cf621dff55..1268a9c57a2 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping3.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping3.types
@@ -70,8 +70,8 @@ var a = tempFun `${ x => x }  ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var b = tempFun `${ (x => x) }  ${ 10 }`
 >b : number
@@ -90,8 +90,8 @@ var b = tempFun `${ (x => x) }  ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c = tempFun `${ ((x => x)) } ${ 10 }`
 >c : number
@@ -112,8 +112,8 @@ var c = tempFun `${ ((x => x)) } ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var d = tempFun `${ x => x } ${ x => x } ${ 10 }`
 >d : number
@@ -136,8 +136,8 @@ var d = tempFun `${ x => x } ${ x => x } ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var e = tempFun `${ x => x } ${ (x => x) } ${ 10 }`
 >e : number
@@ -162,8 +162,8 @@ var e = tempFun `${ x => x } ${ (x => x) } ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var f = tempFun `${ x => x } ${ ((x => x)) } ${ 10 }`
 >f : number
@@ -190,8 +190,8 @@ var f = tempFun `${ x => x } ${ ((x => x)) } ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var g = tempFun `${ (x => x) } ${ (((x => x))) } ${ 10 }`
 >g : number
@@ -222,8 +222,8 @@ var g = tempFun `${ (x => x) } ${ (((x => x))) } ${ 10 }`
 >  : ^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var h = tempFun `${ (x => x) } ${ (((x => x))) } ${ undefined }`
 >h : any
diff --git a/tests/baselines/reference/parenthesizedSatisfiesExpressionWithComments.types b/tests/baselines/reference/parenthesizedSatisfiesExpressionWithComments.types
index 40088dc0e12..9065d93366b 100644
--- a/tests/baselines/reference/parenthesizedSatisfiesExpressionWithComments.types
+++ b/tests/baselines/reference/parenthesizedSatisfiesExpressionWithComments.types
@@ -6,24 +6,24 @@
 >             : ^^^^^^^^^^^^
 
 const a = (/*comm*/ 10 satisfies number);
->a : number
->  : ^^^^^^
->(/*comm*/ 10 satisfies number) : number
->                               : ^^^^^^
->10 satisfies number : number
->                    : ^^^^^^
->10 : number
->   : ^^^^^^
+>a : 10
+>  : ^^
+>(/*comm*/ 10 satisfies number) : 10
+>                               : ^^
+>10 satisfies number : 10
+>                    : ^^
+>10 : 10
+>   : ^^
 
 const b = ((/*comm*/ 10 satisfies number));
->b : number
->  : ^^^^^^
->((/*comm*/ 10 satisfies number)) : number
->                                 : ^^^^^^
->(/*comm*/ 10 satisfies number) : number
->                               : ^^^^^^
->10 satisfies number : number
->                    : ^^^^^^
->10 : number
->   : ^^^^^^
+>b : 10
+>  : ^^
+>((/*comm*/ 10 satisfies number)) : 10
+>                                 : ^^
+>(/*comm*/ 10 satisfies number) : 10
+>                               : ^^
+>10 satisfies number : 10
+>                    : ^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/parseAssertEntriesError.types b/tests/baselines/reference/parseAssertEntriesError.types
index 628550cfd2e..f73ee86260e 100644
--- a/tests/baselines/reference/parseAssertEntriesError.types
+++ b/tests/baselines/reference/parseAssertEntriesError.types
@@ -24,8 +24,8 @@ export type LocalInterface =
 >                                                                               : ^^^
 >import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >assert : { 1234: any; "resolution-mode": string; }
@@ -38,8 +38,8 @@ export type LocalInterface =
 > : ^^^
 >"resolution-mode" : string
 >                  : ^^^^^^
->"import" : string
->         : ^^^^^^
+>"import" : "import"
+>         : ^^^^^^^^
 >ImportInterface : any
 >                : ^^^
 
diff --git a/tests/baselines/reference/parseErrorDoubleCommaInCall.types b/tests/baselines/reference/parseErrorDoubleCommaInCall.types
index 3eaed35e7fc..aee1a328afe 100644
--- a/tests/baselines/reference/parseErrorDoubleCommaInCall.types
+++ b/tests/baselines/reference/parseErrorDoubleCommaInCall.types
@@ -12,8 +12,8 @@ Boolean({
     x: 0,,
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 });
 
diff --git a/tests/baselines/reference/parseGenericArrowRatherThanLeftShift.types b/tests/baselines/reference/parseGenericArrowRatherThanLeftShift.types
index 6b0b7878d7e..c973125f6f0 100644
--- a/tests/baselines/reference/parseGenericArrowRatherThanLeftShift.types
+++ b/tests/baselines/reference/parseGenericArrowRatherThanLeftShift.types
@@ -28,6 +28,6 @@ const b = foo<<T>(x: T) => number>(() => 1);
 >  : ^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/parseImportAttributesError.types b/tests/baselines/reference/parseImportAttributesError.types
index aa0dee16d08..db8f75e9838 100644
--- a/tests/baselines/reference/parseImportAttributesError.types
+++ b/tests/baselines/reference/parseImportAttributesError.types
@@ -24,8 +24,8 @@ export type LocalInterface =
 >                                                                             : ^^^
 >import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >                                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"pkg" : string
->      : ^^^^^^
+>"pkg" : "pkg"
+>      : ^^^^^
 >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
 >                                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >with : { 1234: any; "resolution-mode": string; }
@@ -38,8 +38,8 @@ export type LocalInterface =
 > : ^^^
 >"resolution-mode" : string
 >                  : ^^^^^^
->"import" : string
->         : ^^^^^^
+>"import" : "import"
+>         : ^^^^^^^^
 >ImportInterface : any
 >                : ^^^
 
diff --git a/tests/baselines/reference/parseInvalidNonNullableTypes.types b/tests/baselines/reference/parseInvalidNonNullableTypes.types
index 1d542a93d71..2bf759d6bb6 100644
--- a/tests/baselines/reference/parseInvalidNonNullableTypes.types
+++ b/tests/baselines/reference/parseInvalidNonNullableTypes.types
@@ -66,8 +66,8 @@ const a = 1 as any!;
 const b: number! = 1;
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const c = 1 as !any;
 >c : any
@@ -80,6 +80,6 @@ const c = 1 as !any;
 const d: !number = 1;
 >d : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/parseInvalidNullableTypes.types b/tests/baselines/reference/parseInvalidNullableTypes.types
index afd52d154a1..87b94a22ae1 100644
--- a/tests/baselines/reference/parseInvalidNullableTypes.types
+++ b/tests/baselines/reference/parseInvalidNullableTypes.types
@@ -58,8 +58,8 @@ const a = 1 as any?;
 const b: number? = 1;
 >b : number | null
 >  : ^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const c = 1 as ?any;
 >c : any
@@ -72,8 +72,8 @@ const c = 1 as ?any;
 const d: ?number = 1;
 >d : number | null
 >  : ^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 let e: unknown?;
 >e : unknown
diff --git a/tests/baselines/reference/parser536727.types b/tests/baselines/reference/parser536727.types
index bdbe0a3f26b..c50671dbd68 100644
--- a/tests/baselines/reference/parser536727.types
+++ b/tests/baselines/reference/parser536727.types
@@ -14,8 +14,8 @@ function foo(f: (x: string) => string) {
 >      : ^^^^^^
 >f : (x: string) => string
 >  : ^ ^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 var g = (x: string) => x + "blah";
 >g : (x: string) => string
diff --git a/tests/baselines/reference/parserArgumentList1.types b/tests/baselines/reference/parserArgumentList1.types
index c189d3d5442..01a656ce77d 100644
--- a/tests/baselines/reference/parserArgumentList1.types
+++ b/tests/baselines/reference/parserArgumentList1.types
@@ -36,8 +36,8 @@ export function removeClass (node:HTMLElement, className:string) {
 >                 : ^^^
 >className : string
 >          : ^^^^^^
->function (everything, leftDelimiter, name, rightDelimiter) {		return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '';	} : (everything: string, leftDelimiter: any, name: any, rightDelimiter: any) => string
->                                                                                                                                      : ^          ^^^^^^^^^^             ^^^^^^^    ^^^^^^^              ^^^^^^^^^^^^^^^^
+>function (everything, leftDelimiter, name, rightDelimiter) {		return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '';	} : (everything: string, leftDelimiter: any, name: any, rightDelimiter: any) => " " | ""
+>                                                                                                                                      : ^          ^^^^^^^^^^             ^^^^^^^    ^^^^^^^              ^^^^^^^^^^^^^^^^^^
 >everything : string
 >           : ^^^^^^
 >leftDelimiter : any
@@ -48,8 +48,8 @@ export function removeClass (node:HTMLElement, className:string) {
 >               : ^^^
 
 		return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '';
->leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '' : string
->                                                              : ^^^^^^
+>leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '' : "" | " "
+>                                                              : ^^^^^^^^
 >leftDelimiter.length + rightDelimiter.length === 2 : boolean
 >                                                   : ^^^^^^^
 >leftDelimiter.length + rightDelimiter.length : any
@@ -68,10 +68,10 @@ export function removeClass (node:HTMLElement, className:string) {
 >       : ^^^
 >2 : 2
 >  : ^
->' ' : string
->    : ^^^^^^
->'' : string
->   : ^^^^^^
+>' ' : " "
+>    : ^^^
+>'' : ""
+>   : ^^
 
 	});
 }
diff --git a/tests/baselines/reference/parserAstSpans1.types b/tests/baselines/reference/parserAstSpans1.types
index f35ff7eaabc..7c4d7ca4540 100644
--- a/tests/baselines/reference/parserAstSpans1.types
+++ b/tests/baselines/reference/parserAstSpans1.types
@@ -477,8 +477,8 @@ class c3 extends c2 {
 >          : ^^^^
 >super : typeof c2
 >      : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         this.p1 = super.c2_p1;
 >this.p1 = super.c2_p1 : number
@@ -539,8 +539,8 @@ var c2_i = new c2(10);
 >           : ^^
 >c2 : typeof c2
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 var c3_i = new c3();
 >c3_i : c3
@@ -692,8 +692,8 @@ var c4_i = new c4(10);
 >           : ^^
 >c4 : typeof c4
 >   : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 interface i2 {
     /** i2_p1*/
diff --git a/tests/baselines/reference/parserComputedPropertyName28.types b/tests/baselines/reference/parserComputedPropertyName28.types
index 3b5e5020c2c..912fddbb711 100644
--- a/tests/baselines/reference/parserComputedPropertyName28.types
+++ b/tests/baselines/reference/parserComputedPropertyName28.types
@@ -10,8 +10,8 @@ class C {
 >    : ^^^^^^
 >e : any
 >  : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     [e2]: number
 >[e2] : number
diff --git a/tests/baselines/reference/parserES5ForOfStatement7.types b/tests/baselines/reference/parserES5ForOfStatement7.types
index f1e8e59d27d..4c595e321c5 100644
--- a/tests/baselines/reference/parserES5ForOfStatement7.types
+++ b/tests/baselines/reference/parserES5ForOfStatement7.types
@@ -4,12 +4,12 @@
 for (var a: number = 1, b: string = "" of X) {
 >a : any
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : any
 >  : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/parserES5SymbolProperty6.types b/tests/baselines/reference/parserES5SymbolProperty6.types
index a9f00080ec3..2a66db4dc71 100644
--- a/tests/baselines/reference/parserES5SymbolProperty6.types
+++ b/tests/baselines/reference/parserES5SymbolProperty6.types
@@ -14,6 +14,6 @@ class C {
 >       : ^^^
 >toStringTag : any
 >            : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
index 7b79f12de86..3450d8be6e3 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
@@ -80,10 +80,10 @@ module Shapes {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
     }
 
 }
@@ -100,10 +100,10 @@ var p: IPoint = new Shapes.Point(3, 4);
 >       : ^^^^^^^^^^^^^
 >Point : typeof Shapes.Point
 >      : ^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 var dist = p.getDist();
 >dist : number
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
index 048e0e5c0b5..615d9357f26 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
@@ -82,10 +82,10 @@ module Shapes {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
     }
 
 }
@@ -102,10 +102,10 @@ var p: IPoint = new Shapes.Point(3, 4);
 >       : ^^^^^^^^^^^^^
 >Point : typeof Shapes.Point
 >      : ^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 var dist = p.getDist();
 >dist : number
diff --git a/tests/baselines/reference/parserForInStatement7.types b/tests/baselines/reference/parserForInStatement7.types
index 2e07b9f42b4..400efabee23 100644
--- a/tests/baselines/reference/parserForInStatement7.types
+++ b/tests/baselines/reference/parserForInStatement7.types
@@ -4,12 +4,12 @@
 for (var a: number = 1, b: string = "" in X) {
 >a : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/parserForOfStatement7.types b/tests/baselines/reference/parserForOfStatement7.types
index 026caa4a96e..05edac7020c 100644
--- a/tests/baselines/reference/parserForOfStatement7.types
+++ b/tests/baselines/reference/parserForOfStatement7.types
@@ -4,12 +4,12 @@
 for (var a: number = 1, b: string = "" of X) {
 >a : any
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : any
 >  : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/parserModule1.types b/tests/baselines/reference/parserModule1.types
index e9628e21d6d..d4f0a3e9d93 100644
--- a/tests/baselines/reference/parserModule1.types
+++ b/tests/baselines/reference/parserModule1.types
@@ -26,8 +26,8 @@
         export var analysisPass: number = 0;
 >analysisPass : number
 >             : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         export function Alert(output: string) {
 >Alert : (output: string) => void
diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types
index 4648913d351..b2f62f9dd5e 100644
--- a/tests/baselines/reference/parserModuleDeclaration11.types
+++ b/tests/baselines/reference/parserModuleDeclaration11.types
@@ -20,8 +20,8 @@ string.foo("abc");
 >       : ^^^^^^^^^^^^^
 >foo : (s: string) => any
 >    : ^ ^^      ^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 var x: string.X;
 >x : string.X
diff --git a/tests/baselines/reference/parserObjectCreation1.types b/tests/baselines/reference/parserObjectCreation1.types
index 1a618b944b7..c092e539cb8 100644
--- a/tests/baselines/reference/parserObjectCreation1.types
+++ b/tests/baselines/reference/parserObjectCreation1.types
@@ -8,6 +8,6 @@ var autoToken: number[] = new Array<number[]>(1);
 >                       : ^^^^^^^^^^
 >Array : ArrayConstructor
 >      : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/parserRealSource1.types b/tests/baselines/reference/parserRealSource1.types
index bfe71f39000..dd6543ab658 100644
--- a/tests/baselines/reference/parserRealSource1.types
+++ b/tests/baselines/reference/parserRealSource1.types
@@ -35,8 +35,8 @@ module TypeScript {
         export var analysisPass: number = 0;
 >analysisPass : number
 >             : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         export function Alert(output: string) {
 >Alert : (output: string) => void
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index 2f80bc651fe..3ba5196d8a2 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -1052,8 +1052,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"any" : string
->      : ^^^^^^
+>"any" : "any"
+>      : ^^^^^
 >ErrorRecoverySet.PrimType : any
 >                          : ^^^
 >ErrorRecoverySet : any
@@ -1102,8 +1102,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"boolean" : string
->          : ^^^^^^
+>"boolean" : "boolean"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.PrimType : any
 >                          : ^^^
 >ErrorRecoverySet : any
@@ -1152,8 +1152,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"break" : string
->        : ^^^^^^
+>"break" : "break"
+>        : ^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1202,7 +1202,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"case" : string
+>"case" : "case"
 >       : ^^^^^^
 >ErrorRecoverySet.SCase : any
 >                       : ^^^
@@ -1252,8 +1252,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"catch" : string
->        : ^^^^^^
+>"catch" : "catch"
+>        : ^^^^^^^
 >ErrorRecoverySet.Catch : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -1302,8 +1302,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"class" : string
->        : ^^^^^^
+>"class" : "class"
+>        : ^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -1352,8 +1352,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"const" : string
->        : ^^^^^^
+>"const" : "const"
+>        : ^^^^^^^
 >ErrorRecoverySet.Var : any
 >                     : ^^^
 >ErrorRecoverySet : any
@@ -1402,8 +1402,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"continue" : string
->           : ^^^^^^
+>"continue" : "continue"
+>           : ^^^^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1452,8 +1452,8 @@ module TypeScript {
 >         : ^^^
 >Debugger : any
 >         : ^^^
->"debugger" : string
->           : ^^^^^^
+>"debugger" : "debugger"
+>           : ^^^^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1502,8 +1502,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"default" : string
->          : ^^^^^^
+>"default" : "default"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.SCase : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -1552,8 +1552,8 @@ module TypeScript {
 >         : ^^^
 >Delete : any
 >       : ^^^
->"delete" : string
->         : ^^^^^^
+>"delete" : "delete"
+>         : ^^^^^^^^
 >ErrorRecoverySet.Prefix : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -1602,8 +1602,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"do" : string
->     : ^^^^^^
+>"do" : "do"
+>     : ^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1652,7 +1652,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"else" : string
+>"else" : "else"
 >       : ^^^^^^
 >ErrorRecoverySet.Else : any
 >                      : ^^^
@@ -1702,7 +1702,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"enum" : string
+>"enum" : "enum"
 >       : ^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
@@ -1752,8 +1752,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"export" : string
->         : ^^^^^^
+>"export" : "export"
+>         : ^^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -1802,8 +1802,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"extends" : string
->          : ^^^^^^
+>"extends" : "extends"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1852,8 +1852,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"declare" : string
->          : ^^^^^^
+>"declare" : "declare"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1902,8 +1902,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"false" : string
->        : ^^^^^^
+>"false" : "false"
+>        : ^^^^^^^
 >ErrorRecoverySet.RLit : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -1952,8 +1952,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"finally" : string
->          : ^^^^^^
+>"finally" : "finally"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.Catch : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -2002,8 +2002,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"for" : string
->      : ^^^^^^
+>"for" : "for"
+>      : ^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2052,8 +2052,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"function" : string
->           : ^^^^^^
+>"function" : "function"
+>           : ^^^^^^^^^^
 >ErrorRecoverySet.Func : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2102,8 +2102,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"constructor" : string
->              : ^^^^^^
+>"constructor" : "constructor"
+>              : ^^^^^^^^^^^^^
 >ErrorRecoverySet.Func : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2152,8 +2152,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"get" : string
->      : ^^^^^^
+>"get" : "get"
+>      : ^^^^^
 >ErrorRecoverySet.Func : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2202,8 +2202,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"set" : string
->      : ^^^^^^
+>"set" : "set"
+>      : ^^^^^
 >ErrorRecoverySet.Func : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2252,8 +2252,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"if" : string
->     : ^^^^^^
+>"if" : "if"
+>     : ^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2302,8 +2302,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"implements" : string
->             : ^^^^^^
+>"implements" : "implements"
+>             : ^^^^^^^^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2352,8 +2352,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"import" : string
->         : ^^^^^^
+>"import" : "import"
+>         : ^^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -2402,8 +2402,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"in" : string
->     : ^^^^^^
+>"in" : "in"
+>     : ^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2452,8 +2452,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"instanceof" : string
->             : ^^^^^^
+>"instanceof" : "instanceof"
+>             : ^^^^^^^^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -2502,8 +2502,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"interface" : string
->            : ^^^^^^
+>"interface" : "interface"
+>            : ^^^^^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -2552,8 +2552,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"let" : string
->      : ^^^^^^
+>"let" : "let"
+>      : ^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2602,8 +2602,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"module" : string
->         : ^^^^^^
+>"module" : "module"
+>         : ^^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -2652,8 +2652,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"new" : string
->      : ^^^^^^
+>"new" : "new"
+>      : ^^^^^
 >ErrorRecoverySet.PreOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -2702,8 +2702,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"number" : string
->         : ^^^^^^
+>"number" : "number"
+>         : ^^^^^^^^
 >ErrorRecoverySet.PrimType : any
 >                          : ^^^
 >ErrorRecoverySet : any
@@ -2752,7 +2752,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"null" : string
+>"null" : "null"
 >       : ^^^^^^
 >ErrorRecoverySet.RLit : any
 >                      : ^^^
@@ -2802,8 +2802,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"package" : string
->          : ^^^^^^
+>"package" : "package"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2852,8 +2852,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"private" : string
->          : ^^^^^^
+>"private" : "private"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -2902,8 +2902,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"protected" : string
->            : ^^^^^^
+>"protected" : "protected"
+>            : ^^^^^^^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -2952,8 +2952,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"public" : string
->         : ^^^^^^
+>"public" : "public"
+>         : ^^^^^^^^
 >ErrorRecoverySet.TypeScriptS : any
 >                             : ^^^
 >ErrorRecoverySet : any
@@ -3002,8 +3002,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"return" : string
->         : ^^^^^^
+>"return" : "return"
+>         : ^^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3052,8 +3052,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"static" : string
->         : ^^^^^^
+>"static" : "static"
+>         : ^^^^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3102,8 +3102,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >ErrorRecoverySet.PrimType : any
 >                          : ^^^
 >ErrorRecoverySet : any
@@ -3152,8 +3152,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"super" : string
->        : ^^^^^^
+>"super" : "super"
+>        : ^^^^^^^
 >ErrorRecoverySet.RLit : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3202,8 +3202,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"switch" : string
->         : ^^^^^^
+>"switch" : "switch"
+>         : ^^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3252,7 +3252,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"this" : string
+>"this" : "this"
 >       : ^^^^^^
 >ErrorRecoverySet.RLit : any
 >                      : ^^^
@@ -3302,8 +3302,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"throw" : string
->        : ^^^^^^
+>"throw" : "throw"
+>        : ^^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3352,7 +3352,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"true" : string
+>"true" : "true"
 >       : ^^^^^^
 >ErrorRecoverySet.RLit : any
 >                      : ^^^
@@ -3402,8 +3402,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"try" : string
->      : ^^^^^^
+>"try" : "try"
+>      : ^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3452,8 +3452,8 @@ module TypeScript {
 >         : ^^^
 >Typeof : any
 >       : ^^^
->"typeof" : string
->         : ^^^^^^
+>"typeof" : "typeof"
+>         : ^^^^^^^^
 >ErrorRecoverySet.Prefix : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -3502,8 +3502,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"var" : string
->      : ^^^^^^
+>"var" : "var"
+>      : ^^^^^
 >ErrorRecoverySet.Var : any
 >                     : ^^^
 >ErrorRecoverySet : any
@@ -3552,7 +3552,7 @@ module TypeScript {
 >         : ^^^
 >Void : any
 >     : ^^^
->"void" : string
+>"void" : "void"
 >       : ^^^^^^
 >ErrorRecoverySet.Prefix : any
 >                        : ^^^
@@ -3602,7 +3602,7 @@ module TypeScript {
 >         : ^^^
 >With : any
 >     : ^^^
->"with" : string
+>"with" : "with"
 >       : ^^^^^^
 >ErrorRecoverySet.Stmt : any
 >                      : ^^^
@@ -3652,8 +3652,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"while" : string
->        : ^^^^^^
+>"while" : "while"
+>        : ^^^^^^^
 >ErrorRecoverySet.While : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -3702,8 +3702,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"yield" : string
->        : ^^^^^^
+>"yield" : "yield"
+>        : ^^^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -3752,8 +3752,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"identifier" : string
->             : ^^^^^^
+>"identifier" : "identifier"
+>             : ^^^^^^^^^^^^
 >ErrorRecoverySet.ID : any
 >                    : ^^^
 >ErrorRecoverySet : any
@@ -3802,8 +3802,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"numberLiteral" : string
->                : ^^^^^^
+>"numberLiteral" : "numberLiteral"
+>                : ^^^^^^^^^^^^^^^
 >ErrorRecoverySet.Literal : any
 >                         : ^^^
 >ErrorRecoverySet : any
@@ -3852,8 +3852,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"regex" : string
->        : ^^^^^^
+>"regex" : "regex"
+>        : ^^^^^^^
 >ErrorRecoverySet.RegExp : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -3902,8 +3902,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"qstring" : string
->          : ^^^^^^
+>"qstring" : "qstring"
+>          : ^^^^^^^^^
 >ErrorRecoverySet.Literal : any
 >                         : ^^^
 >ErrorRecoverySet : any
@@ -3953,8 +3953,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->";" : string
->    : ^^^^^^
+>";" : ";"
+>    : ^^^
 >ErrorRecoverySet.SColon : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -4003,8 +4003,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->")" : string
->    : ^^^^^^
+>")" : ")"
+>    : ^^^
 >ErrorRecoverySet.RParen : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -4053,8 +4053,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"]" : string
->    : ^^^^^^
+>"]" : "]"
+>    : ^^^
 >ErrorRecoverySet.RBrack : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -4103,8 +4103,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"{" : string
->    : ^^^^^^
+>"{" : "{"
+>    : ^^^
 >ErrorRecoverySet.LCurly : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -4153,8 +4153,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"}" : string
->    : ^^^^^^
+>"}" : "}"
+>    : ^^^
 >ErrorRecoverySet.RCurly : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -4203,8 +4203,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"..." : string
->      : ^^^^^^
+>"..." : "..."
+>      : ^^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
@@ -4254,8 +4254,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"," : string
->    : ^^^^^^
+>"," : ","
+>    : ^^^
 >ErrorRecoverySet.Comma : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4304,8 +4304,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"=" : string
->    : ^^^^^^
+>"=" : "="
+>    : ^^^
 >ErrorRecoverySet.Asg : any
 >                     : ^^^
 >ErrorRecoverySet : any
@@ -4354,8 +4354,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"+=" : string
->     : ^^^^^^
+>"+=" : "+="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4404,8 +4404,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"-=" : string
->     : ^^^^^^
+>"-=" : "-="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4454,8 +4454,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"*=" : string
->     : ^^^^^^
+>"*=" : "*="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4504,8 +4504,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"/=" : string
->     : ^^^^^^
+>"/=" : "/="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4554,8 +4554,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"%=" : string
->     : ^^^^^^
+>"%=" : "%="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4604,8 +4604,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"&=" : string
->     : ^^^^^^
+>"&=" : "&="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4654,8 +4654,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"^=" : string
->     : ^^^^^^
+>"^=" : "^="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4704,8 +4704,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"|=" : string
->     : ^^^^^^
+>"|=" : "|="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4754,8 +4754,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"<<=" : string
->      : ^^^^^^
+>"<<=" : "<<="
+>      : ^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4804,8 +4804,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->">>=" : string
->      : ^^^^^^
+>">>=" : ">>="
+>      : ^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4854,7 +4854,7 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->">>>=" : string
+>">>>=" : ">>>="
 >       : ^^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
@@ -4904,8 +4904,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"?" : string
->    : ^^^^^^
+>"?" : "?"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -4954,8 +4954,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->":" : string
->    : ^^^^^^
+>":" : ":"
+>    : ^^^
 >ErrorRecoverySet.Colon : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5004,8 +5004,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"||" : string
->     : ^^^^^^
+>"||" : "||"
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5054,8 +5054,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"&&" : string
->     : ^^^^^^
+>"&&" : "&&"
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5104,8 +5104,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"|" : string
->    : ^^^^^^
+>"|" : "|"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5154,8 +5154,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"^" : string
->    : ^^^^^^
+>"^" : "^"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5204,8 +5204,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"&" : string
->    : ^^^^^^
+>"&" : "&"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5254,8 +5254,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"==" : string
->     : ^^^^^^
+>"==" : "=="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5304,8 +5304,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"!=" : string
->     : ^^^^^^
+>"!=" : "!="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5354,8 +5354,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"===" : string
->      : ^^^^^^
+>"===" : "==="
+>      : ^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5404,8 +5404,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"!==" : string
->      : ^^^^^^
+>"!==" : "!=="
+>      : ^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5454,8 +5454,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"<" : string
->    : ^^^^^^
+>"<" : "<"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5504,8 +5504,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"<=" : string
->     : ^^^^^^
+>"<=" : "<="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5554,8 +5554,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->">" : string
->    : ^^^^^^
+>">" : ">"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5604,8 +5604,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->">=" : string
->     : ^^^^^^
+>">=" : ">="
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5654,8 +5654,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"<<" : string
->     : ^^^^^^
+>"<<" : "<<"
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5704,8 +5704,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->">>" : string
->     : ^^^^^^
+>">>" : ">>"
+>     : ^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5754,8 +5754,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->">>>" : string
->      : ^^^^^^
+>">>>" : ">>>"
+>      : ^^^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5804,8 +5804,8 @@ module TypeScript {
 >         : ^^^
 >Pos : any
 >    : ^^^
->"+" : string
->    : ^^^^^^
+>"+" : "+"
+>    : ^^^
 >ErrorRecoverySet.AddOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5854,8 +5854,8 @@ module TypeScript {
 >         : ^^^
 >Neg : any
 >    : ^^^
->"-" : string
->    : ^^^^^^
+>"-" : "-"
+>    : ^^^
 >ErrorRecoverySet.AddOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5904,8 +5904,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"*" : string
->    : ^^^^^^
+>"*" : "*"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -5954,8 +5954,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"/" : string
->    : ^^^^^^
+>"/" : "/"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -6004,8 +6004,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"%" : string
->    : ^^^^^^
+>"%" : "%"
+>    : ^^^
 >ErrorRecoverySet.BinOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -6054,8 +6054,8 @@ module TypeScript {
 >         : ^^^
 >Not : any
 >    : ^^^
->"~" : string
->    : ^^^^^^
+>"~" : "~"
+>    : ^^^
 >ErrorRecoverySet.PreOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -6104,8 +6104,8 @@ module TypeScript {
 >         : ^^^
 >LogNot : any
 >       : ^^^
->"!" : string
->    : ^^^^^^
+>"!" : "!"
+>    : ^^^
 >ErrorRecoverySet.PreOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -6154,8 +6154,8 @@ module TypeScript {
 >         : ^^^
 >IncPre : any
 >       : ^^^
->"++" : string
->     : ^^^^^^
+>"++" : "++"
+>     : ^^^^
 >ErrorRecoverySet.PreOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -6204,8 +6204,8 @@ module TypeScript {
 >         : ^^^
 >DecPre : any
 >       : ^^^
->"--" : string
->     : ^^^^^^
+>"--" : "--"
+>     : ^^^^
 >ErrorRecoverySet.PreOp : any
 >                       : ^^^
 >ErrorRecoverySet : any
@@ -6254,8 +6254,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"(" : string
->    : ^^^^^^
+>"(" : "("
+>    : ^^^
 >ErrorRecoverySet.LParen : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -6304,8 +6304,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"[" : string
->    : ^^^^^^
+>"[" : "["
+>    : ^^^
 >ErrorRecoverySet.LBrack : any
 >                        : ^^^
 >ErrorRecoverySet : any
@@ -6354,8 +6354,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"." : string
->    : ^^^^^^
+>"." : "."
+>    : ^^^
 >ErrorRecoverySet.Dot : any
 >                     : ^^^
 >ErrorRecoverySet : any
@@ -6404,8 +6404,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"<EOF>" : string
->        : ^^^^^^
+>"<EOF>" : "<EOF>"
+>        : ^^^^^^^
 >ErrorRecoverySet.EOF : any
 >                     : ^^^
 >ErrorRecoverySet : any
@@ -6454,8 +6454,8 @@ module TypeScript {
 >         : ^^^
 >None : any
 >     : ^^^
->"=>" : string
->     : ^^^^^^
+>"=>" : "=>"
+>     : ^^^^
 >ErrorRecoverySet.None : any
 >                      : ^^^
 >ErrorRecoverySet : any
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index 51a3e07b511..d941bb4c4ef 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -326,8 +326,8 @@ module TypeScript {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please implement in derived class" : string
->                                    : ^^^^^^
+>"please implement in derived class" : "please implement in derived class"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
             return this;
 >this : this
@@ -757,8 +757,8 @@ module TypeScript {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please implement in derived class" : string
->                                    : ^^^^^^
+>"please implement in derived class" : "please implement in derived class"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
             emitter.emitParensAndCommentsInPlace(this, false);
 >emitter.emitParensAndCommentsInPlace(this, false) : any
@@ -1138,8 +1138,8 @@ module TypeScript {
 >      : ^^^^^^^
 >name : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
             var resolved = "";
 >resolved : string
@@ -1233,10 +1233,10 @@ module TypeScript {
 >  : ^^^^^^
 >2 : 2
 >  : ^
->4 : number
->  : ^^^^^^
->16 : number
->   : ^^^^^^
+>4 : 4
+>  : ^
+>16 : 16
+>   : ^^
 
                     resolved += name.substr(start, i - start);
 >resolved += name.substr(start, i - start) : string
@@ -2104,8 +2104,8 @@ module TypeScript {
 >                   : ^^^^
 >super : typeof Identifier
 >      : ^^^^^^^^^^^^^^^^^
->"__missing" : string
->            : ^^^^^^
+>"__missing" : "__missing"
+>            : ^^^^^^^^^^^
         }
 
         public isMissing() {
@@ -2982,8 +2982,8 @@ module TypeScript {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please implement in derived class" : string
->                                    : ^^^^^^
+>"please implement in derived class" : "please implement in derived class"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
             return this;
 >this : this
@@ -3751,8 +3751,8 @@ module TypeScript {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please implement in derived class" : string
->                                    : ^^^^^^
+>"please implement in derived class" : "please implement in derived class"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
             emitter.recordSourceMappingEnd(this);
 >emitter.recordSourceMappingEnd(this) : any
@@ -4767,8 +4767,8 @@ module TypeScript {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please implement in derived class" : string
->                                    : ^^^^^^
+>"please implement in derived class" : "please implement in derived class"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
             return this;
 >this : this
@@ -5373,8 +5373,8 @@ module TypeScript {
 >                                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"should be de-sugared during type check" : string
->                                         : ^^^^^^
+>"should be de-sugared during type check" : "should be de-sugared during type check"
+>                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
                     default:
                         throw new Error("please implement in derived class");
@@ -5382,8 +5382,8 @@ module TypeScript {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"please implement in derived class" : string
->                                    : ^^^^^^
+>"please implement in derived class" : "please implement in derived class"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                 }
             }
             emitter.recordSourceMappingEnd(this);
@@ -5872,8 +5872,8 @@ module TypeScript {
 >      : ^^^^^^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >toString : () => string
 >         : ^^^^^^      
             }
@@ -7056,8 +7056,8 @@ module TypeScript {
 >         : ^^^
 >ArgDecl : any
 >        : ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
 
         public isOptional = false;
@@ -8393,8 +8393,8 @@ module TypeScript {
 >                                      : ^^^^^^^^^^^^
 >LocationInfo : typeof LocationInfo
 >             : ^^^^^^^^^^^^^^^^^^^
->"unknown" : string
->          : ^^^^^^
+>"unknown" : "unknown"
+>          : ^^^^^^^^^
 >-1 : -1
 >   : ^^
 >1 : 1
@@ -8498,8 +8498,8 @@ module TypeScript {
 >                         : ^^^^^^^^^^
 >Identifier : typeof Identifier
 >           : ^^^^^^^^^^^^^^^^^
->"script" : string
->         : ^^^^^^
+>"script" : "script"
+>         : ^^^^^^^^
 >false : false
 >      : ^^^^^
 >vars : ASTList
@@ -16183,8 +16183,8 @@ module TypeScript {
 >                                        : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"should not emit a type ref" : string
->                             : ^^^^^^
+>"should not emit a type ref" : "should not emit a type ref"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
 
         public typeCheck(typeFlow: TypeFlow) {
@@ -18618,8 +18618,8 @@ module TypeScript {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/^\s+|\s+$/g : RegExp
 >             : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
                     }
                 }
                 else {
@@ -18650,8 +18650,8 @@ module TypeScript {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/^\s+|\s+$/g : RegExp
 >             : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
                 }
             }
 
diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types
index 13f3f4efd62..6763d907264 100644
--- a/tests/baselines/reference/parserRealSource12.types
+++ b/tests/baselines/reference/parserRealSource12.types
@@ -3087,8 +3087,8 @@ module TypeScript {
 >                                                                       : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"initWalkers function is not up to date with enum content!" : string
->                                                            : ^^^^^^
+>"initWalkers function is not up to date with enum content!" : "initWalkers function is not up to date with enum content!"
+>                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                 }
             }
         }
diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types
index f83351a110b..6619d911f41 100644
--- a/tests/baselines/reference/parserRealSource14.types
+++ b/tests/baselines/reference/parserRealSource14.types
@@ -406,8 +406,8 @@ module TypeScript {
 >                                  : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Invalid call to 'up'" : string
->                       : ^^^^^^
+>"Invalid call to 'up'" : "Invalid call to 'up'"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
             this.top--;
 >this.top-- : number
@@ -453,8 +453,8 @@ module TypeScript {
 >                                    : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Invalid call to 'down'" : string
->                         : ^^^^^^
+>"Invalid call to 'down'" : "Invalid call to 'down'"
+>                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 
             this.top++;
 >this.top++ : number
diff --git a/tests/baselines/reference/parserRealSource4.types b/tests/baselines/reference/parserRealSource4.types
index 847383e99ed..639d1e2f059 100644
--- a/tests/baselines/reference/parserRealSource4.types
+++ b/tests/baselines/reference/parserRealSource4.types
@@ -1205,8 +1205,8 @@ module TypeScript {
         public itemCount: number = 0;
 >itemCount : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         public table = new HashEntry[];
 >table : any
@@ -1239,8 +1239,8 @@ module TypeScript {
             for (var i: number = 0; i < this.size; i++) {
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < this.size : boolean
 >              : ^^^^^^^
 >i : number
diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types
index 8643dab7797..8f3ed1a4a4b 100644
--- a/tests/baselines/reference/parserRealSource5.types
+++ b/tests/baselines/reference/parserRealSource5.types
@@ -139,12 +139,12 @@ module TypeScript {
 >          : ^^^^^^^^^
 
                 indentString = "";
->indentString = "" : string
->                  : ^^^^^^
+>indentString = "" : ""
+>                  : ^^
 >indentString : string
 >             : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
                 for (var i = 0; i < this.indentAmt; i++) {
 >i : number
@@ -269,16 +269,16 @@ module TypeScript {
 >        : ^^^^^^
 
             this.builder = "";
->this.builder = "" : string
->                  : ^^^^^^
+>this.builder = "" : ""
+>                  : ^^
 >this.builder : string
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >builder : string
 >        : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
         }
 
     }
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index 38efd603675..ab395310ba9 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -477,12 +477,12 @@ module TypeScript {
                 for (i = 0, len = type.implementsList.length; i < len; i++) {
 >i = 0, len = type.implementsList.length : any
 >                                        : ^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >len = type.implementsList.length : any
 >                                 : ^^^
 >len : any
diff --git a/tests/baselines/reference/parserS7.2_A1.5_T2.types b/tests/baselines/reference/parserS7.2_A1.5_T2.types
index 91da9a85052..9650c1acebe 100644
--- a/tests/baselines/reference/parserS7.2_A1.5_T2.types
+++ b/tests/baselines/reference/parserS7.2_A1.5_T2.types
@@ -17,8 +17,8 @@ eval("\u00A0var x\u00A0= 1\u00A0");
 >                                   : ^^^
 >eval : (x: string) => any
 >     : ^ ^^      ^^^^^   
->"\u00A0var x\u00A0= 1\u00A0" : string
->                             : ^^^^^^
+>"\u00A0var x\u00A0= 1\u00A0" : " var x = 1 "
+>                             : ^^^^^^^^^^^^^
 
 if (x !== 1) {
 >x !== 1 : boolean
diff --git a/tests/baselines/reference/parserSymbolProperty6.types b/tests/baselines/reference/parserSymbolProperty6.types
index 68feded4ff5..f1b3b7ca642 100644
--- a/tests/baselines/reference/parserSymbolProperty6.types
+++ b/tests/baselines/reference/parserSymbolProperty6.types
@@ -14,6 +14,6 @@ class C {
 >       : ^^^^^^^^^^^^^^^^^
 >toStringTag : unique symbol
 >            : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index fe375c4e535..0326d8453ba 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -67,8 +67,8 @@ function switchToForwardSlashes(path: string) {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/\\/g : RegExp
 >      : ^^^^^^
->"/" : string
->    : ^^^^^^
+>"/" : "/"
+>    : ^^^
 }
 
 function filePath(fullPath: string) {
@@ -114,8 +114,8 @@ function filePath(fullPath: string) {
 >           : ^^^^^^^^
 >slice : (start?: number, end?: number) => string[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >components.length - 1 : number
 >                      : ^^^^^^
 >components.length : number
@@ -138,8 +138,8 @@ function filePath(fullPath: string) {
 >     : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"/" : string
->    : ^^^^^^
+>"/" : "/"
+>    : ^^^
 >"/" : "/"
 >    : ^^^
 }
@@ -236,8 +236,8 @@ if (typeof ActiveXObject === "function") {
 >                             : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Unknown context' : string
->                  : ^^^^^^
+>'Unknown context' : "Unknown context"
+>                  : ^^^^^^^^^^^^^^^^^
 }
 
 declare module process {
@@ -283,8 +283,8 @@ module Harness {
 >                        : ^^^^^^^^
 >Function : FunctionConstructor
 >         : ^^^^^^^^^^^^^^^^^^^
->"return this" : string
->              : ^^^^^^
+>"return this" : "return this"
+>              : ^^^^^^^^^^^^^
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >     : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 
@@ -491,8 +491,8 @@ module Harness {
 >                                   : ^^^^^^
 >msg : string
 >    : ^^^^^^
->"Expected true, got false." : string
->                            : ^^^^^^
+>"Expected true, got false." : "Expected true, got false."
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
         }
 
@@ -1324,8 +1324,8 @@ module Harness {
 >     : ^^^^^^
 >indexOf : (searchString: string, position?: number) => number
 >        : ^            ^^      ^^        ^^^      ^^^^^      
->'tests' : string
->        : ^^^^^^
+>'tests' : "tests"
+>        : ^^^^^^^
 >0 : 0
 >  : ^
 
@@ -2115,8 +2115,8 @@ module Harness {
 >                                                                : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Testcases may not be nested inside other testcases" : string
->                                                     : ^^^^^^
+>"Testcases may not be nested inside other testcases" : "Testcases may not be nested inside other testcases"
+>                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
 
         /** Run the test case block and fail the test if it raised an error. If no error is raised, the test passes. */
@@ -2153,8 +2153,8 @@ module Harness {
 >                                                 : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'testStart' : string
->            : ^^^^^^
+>'testStart' : "testStart"
+>            : ^^^^^^^^^^^
 >{ desc: this.description } : { desc: string; }
 >                           : ^^^^^^^^^^^^^^^^^
 >desc : string
@@ -2225,8 +2225,8 @@ module Harness {
 >                                                             : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'error' : string
->        : ^^^^^^
+>'error' : "error"
+>        : ^^^^^^^
 >{ desc: this.description, pass: false } : { desc: any; pass: boolean; }
 >                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >desc : any
@@ -2262,7 +2262,7 @@ module Harness {
 >                                                        : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'pass' : string
+>'pass' : "pass"
 >       : ^^^^^^
 >{ desc: this.description, pass: true } : { desc: any; pass: boolean; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2395,8 +2395,8 @@ module Harness {
 >                                                     : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'scenarioStart' : string
->                : ^^^^^^
+>'scenarioStart' : "scenarioStart"
+>                : ^^^^^^^^^^^^^^^
 >{ desc: this.description } : { desc: string; }
 >                           : ^^^^^^^^^^^^^^^^^
 >desc : string
@@ -2520,8 +2520,8 @@ module Harness {
 >                               : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'bug' : string
->      : ^^^^^^
+>'bug' : "bug"
+>      : ^^^^^
 >metadata : IScenarioMetadata
 >         : ^^^^^^^^^^^^^^^^^
 >desc : any
@@ -2532,8 +2532,8 @@ module Harness {
 >                                    : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'scenarioEnd' : string
->              : ^^^^^^
+>'scenarioEnd' : "scenarioEnd"
+>              : ^^^^^^^^^^^^^
 >metadata : IScenarioMetadata
 >         : ^^^^^^^^^^^^^^^^^
 >e : any
@@ -2760,8 +2760,8 @@ module Harness {
 >                               : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'bug' : string
->      : ^^^^^^
+>'bug' : "bug"
+>      : ^^^^^
 >metadata : IScenarioMetadata
 >         : ^^^^^^^^^^^^^^^^^
 >desc : any
@@ -2772,8 +2772,8 @@ module Harness {
 >                                 : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'scenarioEnd' : string
->              : ^^^^^^
+>'scenarioEnd' : "scenarioEnd"
+>              : ^^^^^^^^^^^^^
 >metadata : IScenarioMetadata
 >         : ^^^^^^^^^^^^^^^^^
 
@@ -2796,8 +2796,8 @@ module Harness {
 >                        : ^^^^
 >super : typeof Runnable
 >      : ^^^^^^^^^^^^^^^
->'Test Run' : string
->           : ^^^^^^
+>'Test Run' : "Test Run"
+>           : ^^^^^^^^^^
         }
 
         public run() {
@@ -2809,8 +2809,8 @@ module Harness {
 >                 : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'start' : string
->        : ^^^^^^
+>'start' : "start"
+>        : ^^^^^^^
 
             this.runChildren();
 >this.runChildren() : void
@@ -2943,8 +2943,8 @@ module Harness {
 >               : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'end' : string
->      : ^^^^^^
+>'end' : "end"
+>      : ^^^^^
         }
     }
 
@@ -3084,12 +3084,12 @@ module Harness {
                 }
 
                 resolution = 1000;
->resolution = 1000 : number
->                  : ^^^^^^
+>resolution = 1000 : 1000
+>                  : ^^^^
 >resolution : number
 >           : ^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
             }
         }
 
@@ -3112,16 +3112,16 @@ module Harness {
 >      : ^^^^^^^^^^
 
                 this.time = 0;
->this.time = 0 : number
->              : ^^^^^^
+>this.time = 0 : 0
+>              : ^
 >this.time : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >time : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
                 this.startTime = Clock.now();
 >this.startTime = Clock.now() : number
@@ -3525,8 +3525,8 @@ module Harness {
 >  : ^^^^^^
 >sampleMean : number
 >           : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
                 }
 
                 return Math.sqrt(sumOfSquares / this.data.length);
@@ -3721,8 +3721,8 @@ module Harness {
             name: string = '',
 >name : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
             f = benchmark.bench
 >f : (bench?: { (): void; }) => void
@@ -3976,8 +3976,8 @@ module Harness {
 >                                            : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'testStart' : string
->            : ^^^^^^
+>'testStart' : "testStart"
+>            : ^^^^^^^^^^^
 >{ desc: description } : { desc: string; }
 >                      : ^^^^^^^^^^^^^^^^^
 >desc : string
@@ -3990,7 +3990,7 @@ module Harness {
 >                                                                                                                                                                                                                                                                                                                                                                                                                                  : ^^^^
 >emitLog : (field: string, ...params: any[]) => void
 >        : ^     ^^      ^^^^^      ^^     ^^^^^^^^^
->'pass' : string
+>'pass' : "pass"
 >       : ^^^^^^
 >{                        desc: description, pass: true, perfResults: {                            mean: b.results[prop].mean(),                            min: b.results[prop].min(),                            max: b.results[prop].max(),                            stdDev: b.results[prop].stdDev(),                            trials: b.results[prop].data                        }                    } : { desc: string; pass: boolean; perfResults: { mean: number; min: number; max: number; stdDev: number; trials: number[]; }; }
 >                                                                                                                                                                                                                                                                                                                                                                                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -4211,16 +4211,16 @@ module Harness {
 >    : ^^^
 
                 this.currentLine = "";
->this.currentLine = "" : string
->                      : ^^^^^^
+>this.currentLine = "" : ""
+>                      : ^^
 >this.currentLine : string
 >                 : ^^^^^^
 >this : this
 >     : ^^^^
 >currentLine : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
             }
 
             public Close() {
@@ -4262,16 +4262,16 @@ module Harness {
 >            : ^^^^^^
 
                 this.currentLine = "";
->this.currentLine = "" : string
->                      : ^^^^^^
+>this.currentLine = "" : ""
+>                      : ^^
 >this.currentLine : string
 >                 : ^^^^^^
 >this : this
 >     : ^^^^
 >currentLine : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
             }
 
             public reset() {
@@ -4291,16 +4291,16 @@ module Harness {
 >   : ^^^^^^^^^^^
 
                 this.currentLine = "";
->this.currentLine = "" : string
->                      : ^^^^^^
+>this.currentLine = "" : ""
+>                      : ^^
 >this.currentLine : string
 >                 : ^^^^^^
 >this : this
 >     : ^^^^
 >currentLine : string
 >            : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
             }
         }
 
@@ -5081,8 +5081,8 @@ module Harness {
 >              : ^    ^^      ^^        ^^      ^^        ^^                                      ^^       ^^^                  ^^          ^^^                           ^^^^^^^^^
 >testCode : any
 >         : ^^^
->'test.ts' : string
->          : ^^^^^^
+>'test.ts' : "test.ts"
+>          : ^^^^^^^^^
 >function (compilerResult) {                    errors = compilerResult.errors;                } : (compilerResult: CompilerResult) => void
 >                                                                                                : ^              ^^^^^^^^^^^^^^^^^^^^^^^^^
 >compilerResult : CompilerResult
@@ -5947,8 +5947,8 @@ module Harness {
 >     : ^^^^
 >get : (code: string, target: any) => Type
 >    : ^    ^^      ^^      ^^   ^^^^^^^^^
->'var x : any' : string
->              : ^^^^^^
+>'var x : any' : "var x : any"
+>              : ^^^^^^^^^^^^^
 >'x' : "x"
 >    : ^^^
 
@@ -5969,8 +5969,8 @@ module Harness {
 >     : ^^^^
 >get : (code: string, target: any) => Type
 >    : ^    ^^      ^^      ^^   ^^^^^^^^^
->'var x : number' : string
->                 : ^^^^^^
+>'var x : number' : "var x : number"
+>                 : ^^^^^^^^^^^^^^^^
 >'x' : "x"
 >    : ^^^
 
@@ -5991,8 +5991,8 @@ module Harness {
 >     : ^^^^
 >get : (code: string, target: any) => Type
 >    : ^    ^^      ^^      ^^   ^^^^^^^^^
->'var x : string' : string
->                 : ^^^^^^
+>'var x : string' : "var x : string"
+>                 : ^^^^^^^^^^^^^^^^
 >'x' : "x"
 >    : ^^^
 
@@ -6013,8 +6013,8 @@ module Harness {
 >     : ^^^^
 >get : (code: string, target: any) => Type
 >    : ^    ^^      ^^      ^^   ^^^^^^^^^
->'var x : boolean' : string
->                  : ^^^^^^
+>'var x : boolean' : "var x : boolean"
+>                  : ^^^^^^^^^^^^^^^^^
 >'x' : "x"
 >    : ^^^
             }
@@ -6106,8 +6106,8 @@ module Harness {
 >              : ^    ^^      ^^        ^^      ^^        ^^                                      ^^       ^^^                  ^^          ^^^                           ^^^^^^^^^
 >code : string
 >     : ^^^^^^
->'test.ts' : string
->          : ^^^^^^
+>'test.ts' : "test.ts"
+>          : ^^^^^^^^^
 >function (compilerResult) {                    errors = compilerResult.errors;                } : (compilerResult: CompilerResult) => void
 >                                                                                                : ^              ^^^^^^^^^^^^^^^^^^^^^^^^^
 >compilerResult : CompilerResult
@@ -7229,8 +7229,8 @@ module Harness {
 >    : ^^^^^^^^^^^^^^
 >name : any
 >     : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >(<TypeScript.FuncDecl>ast).name.actualText : any
 >                                           : ^^^
 >(<TypeScript.FuncDecl>ast).name : any
@@ -7322,8 +7322,8 @@ module Harness {
 >  : ^^^
 >text : any
 >     : ^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
                         break;
                 }
@@ -7671,8 +7671,8 @@ module Harness {
 >   : ^^^^^^
 >indexOf : (searchString: string, position?: number) => number
 >        : ^            ^^      ^^        ^^^      ^^^^^      
->'.d.ts' : string
->        : ^^^^^^
+>'.d.ts' : ".d.ts"
+>        : ^^^^^^^
 >0 : 0
 >  : ^
 
@@ -7719,8 +7719,8 @@ module Harness {
 >      : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->'\n' : string
->     : ^^^^^^
+>'\n' : "\n"
+>     : ^^^^
 
                         if (verifyNoDeclFile && results != "") {
 >verifyNoDeclFile && results != "" : boolean
@@ -7769,8 +7769,8 @@ module Harness {
 >                                                     : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Compilation did not produce .d.ts files' : string
->                                          : ^^^^^^
+>'Compilation did not produce .d.ts files' : "Compilation did not produce .d.ts files"
+>                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                 }
             } finally {
                 compiler.settings.generateDeclarationFiles = false;
@@ -7847,7 +7847,7 @@ module Harness {
 >                   : ^^^^^^
 >unitName : string
 >         : ^^^^^^
->'0.ts' : string
+>'0.ts' : "0.ts"
 >       : ^^^^^^
 
                 updateUnit('', uName);
@@ -7855,15 +7855,15 @@ module Harness {
 >                      : ^^^^
 >updateUnit : (code: string, unitName: string, setRecovery?: boolean) => void
 >           : ^    ^^      ^^        ^^      ^^           ^^^       ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >uName : string
 >      : ^^^^^^
             }
 
             return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
         }
 
         /** Contains the code and errors of a compilation and some helper methods to check its status. */
@@ -7953,8 +7953,8 @@ module Harness {
 >      : ^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->"\n" : string
->     : ^^^^^^
+>"\n" : "\n"
+>     : ^^^^
 
                 this.errors = [];
 >this.errors = [] : undefined[]
@@ -8031,10 +8031,10 @@ module Harness {
 >    : ^^^
 >filename : any
 >         : ^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 >err.message : any
 >            : ^^^
 >err : any
@@ -8453,8 +8453,8 @@ module Harness {
 >                      : ^^^^
 >updateUnit : (code: string, unitName: string, setRecovery?: boolean) => void
 >           : ^    ^^      ^^        ^^      ^^           ^^^       ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >fname : any
 >      : ^^^
                     }
@@ -9103,8 +9103,8 @@ module Harness {
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >slice : (start?: number, end?: number) => TestCaseParser.TestUnitData[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >units.length - 1 : number
 >                 : ^^^^^^
 >units.length : number
@@ -9284,9 +9284,9 @@ module Harness {
 >        : ^^^^^^^^^^^^^^^^^^
 >unitName : string
 >         : ^^^^^^
->((isDeclareFile) ? '0.d.ts' : '0.ts') : "0.d.ts" | "0.ts"
+>((isDeclareFile) ? '0.d.ts' : '0.ts') : "0.ts" | "0.d.ts"
 >                                      : ^^^^^^^^^^^^^^^^^
->(isDeclareFile) ? '0.d.ts' : '0.ts' : "0.d.ts" | "0.ts"
+>(isDeclareFile) ? '0.d.ts' : '0.ts' : "0.ts" | "0.d.ts"
 >                                    : ^^^^^^^^^^^^^^^^^
 >(isDeclareFile) : boolean
 >                : ^^^^^^^
@@ -9576,8 +9576,8 @@ module Harness {
 >                     : ^^^^
 >updateUnit : (code: string, unitName: string, setRecovery?: boolean) => void
 >           : ^    ^^      ^^        ^^      ^^           ^^^       ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >file : any
 >     : ^^^
 
@@ -10040,8 +10040,8 @@ module Harness {
 >                  : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->', ' : string
->     : ^^^^^^
+>', ' : ", "
+>     : ^^^^
 
                     } else if (fileNameIndex == 0) {
 >fileNameIndex == 0 : boolean
@@ -10190,12 +10190,12 @@ module Harness {
 >                   : ^^^^^^
 
                         currentFileContent = '';
->currentFileContent = '' : string
->                        : ^^^^^^
+>currentFileContent = '' : ""
+>                        : ^^
 >currentFileContent : string
 >                   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
                     } else {
                         // End-of-line
@@ -10262,8 +10262,8 @@ module Harness {
 >                         : ^^^^^^
 >currentFileContent : string
 >                   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
                 name: currentFileName,
 >name : any
@@ -10347,16 +10347,16 @@ module Harness {
 >                  : ^^^^^^
 
             this.version = 1;
->this.version = 1 : number
->                 : ^^^^^^
+>this.version = 1 : 1
+>                 : ^
 >this.version : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >version : number
 >        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
 
         public updateContent(content: string, isResident: boolean) {
@@ -10440,8 +10440,8 @@ module Harness {
 >        : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >minChar : number
 >        : ^^^^^^
 
@@ -10587,8 +10587,8 @@ module Harness {
 >           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.maxScriptVersions - this.editRanges.length : number
 >                                                : ^^^^^^
 >this.maxScriptVersions : number
@@ -10950,8 +10950,8 @@ module Harness {
 >     : ^^^^
 >addScript : (name: string, content: string, isResident?: boolean) => void
 >          : ^    ^^      ^^       ^^      ^^          ^^^^^^^^^^^^^^^^^^^
->"lib.d.ts" : string
->           : ^^^^^^
+>"lib.d.ts" : "lib.d.ts"
+>           : ^^^^^^^^^^
 >Harness.Compiler.libText : any
 >                         : ^^^
 >Harness.Compiler : typeof Compiler
@@ -11327,8 +11327,8 @@ module Harness {
 >                       : ^^^^^^      
 
             return ""; // i.e. default settings
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
         }
 
         public getScriptCount(): number {
@@ -12131,8 +12131,8 @@ module Harness {
 >       : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >edit.minChar : any
 >             : ^^^
 >edit : Services.TextEdit
@@ -12532,8 +12532,8 @@ module Harness {
 >                                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Trying to apply overlapping edits" : string
->                                    : ^^^^^^
+>"Trying to apply overlapping edits" : "Trying to apply overlapping edits"
+>                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                 }
             }
 
@@ -12726,8 +12726,8 @@ module Harness {
 >        : ^^^^^^^^^^^^^^
 >on : (event: string, listener: Function) => any
 >   : ^     ^^      ^^        ^^        ^^^^^^^^
->'uncaughtException' : string
->                    : ^^^^^^
+>'uncaughtException' : "uncaughtException"
+>                    : ^^^^^^^^^^^^^^^^^^^
 >Runnable.handleError : (e: Error) => void
 >                     : ^ ^^     ^^^^^^^^^
 >Runnable : typeof Runnable
@@ -13399,8 +13399,8 @@ module Harness {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >htmlTrailer : string
 >            : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
             } else {
                 reportContent = htmlLeader;
@@ -13520,8 +13520,8 @@ module Harness {
 >                                                                                                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'The generated content was "undefined". Return "null" if no baselining is required."' : string
->                                                                                      : ^^^^^^
+>'The generated content was "undefined". Return "null" if no baselining is required."' : "The generated content was \"undefined\". Return \"null\" if no baselining is required.\""
+>                                                                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             }
 
             // Store the content in the 'local' folder so we
@@ -13593,12 +13593,12 @@ module Harness {
 >       : ^^^^^^
 
                 actual = '<no content>';
->actual = '<no content>' : string
->                        : ^^^^^^
+>actual = '<no content>' : "<no content>"
+>                        : ^^^^^^^^^^^^^^
 >actual : string
 >       : ^^^^^^
->'<no content>' : string
->               : ^^^^^^
+>'<no content>' : "<no content>"
+>               : ^^^^^^^^^^^^^^
             }
 
             var expected = '<no content>';
@@ -13671,8 +13671,8 @@ module Harness {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/\r\n?/g : RegExp
 >         : ^^^^^^
->'\n' : string
->     : ^^^^^^
+>'\n' : "\n"
+>     : ^^^^
 
                 actual = actual.replace(/\r\n?/g, '\n')
 >actual = actual.replace(/\r\n?/g, '\n') : string
@@ -13689,8 +13689,8 @@ module Harness {
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/\r\n?/g : RegExp
 >         : ^^^^^^
->'\n' : string
->     : ^^^^^^
+>'\n' : "\n"
+>     : ^^^^
             }
 
             return { expected: expected, actual: actual };
@@ -14008,8 +14008,8 @@ module Harness {
 >                                                                                                                                                            : ^^^^
 >it : (description: string, block: () => void) => void
 >   : ^           ^^      ^^     ^^          ^^^^^^^^^
->'Can generate the content without error' : string
->                                         : ^^^^^^
+>'Can generate the content without error' : "Can generate the content without error"
+>                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >() => {                        actual = generateActual(actualFilename, generateContent);                    } : () => void
 >                                                                                                              : ^^^^^^^^^^
 
@@ -14034,8 +14034,8 @@ module Harness {
 >                                                                                                                                                                                                                                                                                                   : ^^^^
 >it : (description: string, block: () => void) => void
 >   : ^           ^^      ^^     ^^          ^^^^^^^^^
->'Matches the baseline file' : string
->                            : ^^^^^^
+>'Matches the baseline file' : "Matches the baseline file"
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >() => {                        var comparison = compareToBaseline(actual, relativeFilename, opts);                        writeComparison(comparison.expected, comparison.actual, relativeFilename, actualFilename, descriptionForDescribe);                    } : () => void
 >                                                                                                                                                                                                                                                                  : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types
index c71e0a6f6bd..0d93f460d18 100644
--- a/tests/baselines/reference/parserindenter.types
+++ b/tests/baselines/reference/parserindenter.types
@@ -2376,8 +2376,8 @@ module Formatting {
 >                      : ^                   ^^      ^^     ^^      ^^^^^      
 >languageHostIndentation : string
 >                        : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             //TypeScript: Projection snapshots not supported
 
@@ -2755,8 +2755,8 @@ module Formatting {
 >                    : ^^^^^^
 
                     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
                 var totalIndent = 0;
 >totalIndent : number
@@ -2826,8 +2826,8 @@ module Formatting {
 >  : ^
 
                     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
                 else
                     return this.GetIndentString(null, totalIndent, tabSize, convertTabsToSpaces);
@@ -3308,12 +3308,12 @@ module Formatting {
 >  : ^
 
                 newIndentSize = 0;
->newIndentSize = 0 : number
->                  : ^^^^^^
+>newIndentSize = 0 : 0
+>                  : ^
 >newIndentSize : number
 >              : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
             }
 
             var newIndent = this.GetIndentString(null, newIndentSize, this.editorOptions.TabSize, this.editorOptions.ConvertTabsToSpaces);
@@ -4423,12 +4423,12 @@ module Formatting {
 >          : ^^^^^^
 
                         lastDelta = 0;
->lastDelta = 0 : number
->              : ^^^^^^
+>lastDelta = 0 : 0
+>              : ^
 >lastDelta : number
 >          : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
                     }
 
                     if (indentNode.CanIndent()) {
diff --git a/tests/baselines/reference/parsingDeepParenthensizedExpression.types b/tests/baselines/reference/parsingDeepParenthensizedExpression.types
index 91d82cd6520..5f9591f7180 100644
--- a/tests/baselines/reference/parsingDeepParenthensizedExpression.types
+++ b/tests/baselines/reference/parsingDeepParenthensizedExpression.types
@@ -290,10 +290,10 @@ function Y(e, t) {
 >  : ^
 
                                 for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;
->s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0 : number
->                                                                                     : ^^^^^^
->s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0 : number
->                                                                              : ^^^^^^
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0 : 0
+>                                                                                     : ^
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0 : 0
+>                                                                              : ^
 >s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r : number
 >                                                                       : ^^^^^^
 >s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t : any
@@ -346,18 +346,18 @@ function Y(e, t) {
 >u : any
 >r : number
 >  : ^^^^^^
->d = 0 : number
->      : ^^^^^^
+>d = 0 : 0
+>      : ^
 >d : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
->h = 0 : number
->      : ^^^^^^
+>0 : 0
+>  : ^
+>h = 0 : 0
+>      : ^
 >h : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >h >>> 0 < u >>> 0 : boolean
 >                  : ^^^^^^^
 >h >>> 0 : number
@@ -603,8 +603,8 @@ function Y(e, t) {
                             }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0, o[m >> 2] = g, f = v
 >T : error
 >A : any
->64 : number
->   : ^^^^^^
+>64 : 64
+>   : ^^
 >E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                : ^^^^^^
 >E : number
diff --git a/tests/baselines/reference/partialOfLargeAPIIsAbleToBeWorkedWith.types b/tests/baselines/reference/partialOfLargeAPIIsAbleToBeWorkedWith.types
index e526d0c11a7..28eed6b23ce 100644
--- a/tests/baselines/reference/partialOfLargeAPIIsAbleToBeWorkedWith.types
+++ b/tests/baselines/reference/partialOfLargeAPIIsAbleToBeWorkedWith.types
@@ -342,8 +342,8 @@ for (const k of keys) {
 >  : ^^^^^^^^^^^
 >() => "12" : () => string
 >           : ^^^^^^^^^^^^
->"12" : string
->     : ^^^^^^
+>"12" : "12"
+>     : ^^^^
 }
 
 type PartialNull<T> = {[K in keyof T]?: T[K] | null};
@@ -373,7 +373,7 @@ for (const k of keys) {
 >  : ^^^^^^^^^^^
 >() => "12" : () => string
 >           : ^^^^^^^^^^^^
->"12" : string
->     : ^^^^^^
+>"12" : "12"
+>     : ^^^^
 }
 
diff --git a/tests/baselines/reference/partiallyNamedTuples2.types b/tests/baselines/reference/partiallyNamedTuples2.types
index 6a6620293ec..d2abb8d3dcb 100644
--- a/tests/baselines/reference/partiallyNamedTuples2.types
+++ b/tests/baselines/reference/partiallyNamedTuples2.types
@@ -41,8 +41,8 @@ const id1 = "abc" as string;
 >    : ^^^^^^
 >"abc" as string : string
 >                : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 const matches = x.get(id1);
 >matches : Iterable<[id2: string, object]>
diff --git a/tests/baselines/reference/plainJSGrammarErrors.types b/tests/baselines/reference/plainJSGrammarErrors.types
index 7545ede9fb4..468fbb05e56 100644
--- a/tests/baselines/reference/plainJSGrammarErrors.types
+++ b/tests/baselines/reference/plainJSGrammarErrors.types
@@ -942,8 +942,8 @@ const trinaryDynamicImport = import('1', '2', '3')
 >                     : ^^^^^^^^^^^^
 >import('1', '2', '3') : Promise<any>
 >                      : ^^^^^^^^^^^^
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 >'2' : "2"
 >    : ^^^
 >'3' : "3"
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types
index 3ecc11a6272..57ec667d52b 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.types
+++ b/tests/baselines/reference/plusOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types
index e4b0173f27f..ec3d7429ee4 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.types
+++ b/tests/baselines/reference/plusOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -203,8 +203,8 @@ var ResultIsNumber12 = +STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // miss assignment operators
 +"";
diff --git a/tests/baselines/reference/potentiallyUncalledDecorators.types b/tests/baselines/reference/potentiallyUncalledDecorators.types
index c071ab31b59..81a90410ff6 100644
--- a/tests/baselines/reference/potentiallyUncalledDecorators.types
+++ b/tests/baselines/reference/potentiallyUncalledDecorators.types
@@ -52,7 +52,7 @@ class MultiplyByTwo {
 >                : ^^^
 >tracked : PropertyDecorator & ((...watchedProperties: string[]) => any)
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^                 ^^        ^^^^^   ^
->'args' : string
+>'args' : "args"
 >       : ^^^^^^
 
     get multiplied() {
diff --git a/tests/baselines/reference/prettyFileWithErrorsAndTabs.types b/tests/baselines/reference/prettyFileWithErrorsAndTabs.types
index cbb261b5602..f5f1b43188e 100644
--- a/tests/baselines/reference/prettyFileWithErrorsAndTabs.types
+++ b/tests/baselines/reference/prettyFileWithErrorsAndTabs.types
@@ -8,19 +8,19 @@ function f() {
 		const x: string = 12;
 >x : string
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 		const y: string = 12;
 >y : string
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 		const z: string = 12;
 >z : string
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 	}
 }
diff --git a/tests/baselines/reference/primitiveConstraints1.types b/tests/baselines/reference/primitiveConstraints1.types
index e5392cd95b4..2759a2ea0e4 100644
--- a/tests/baselines/reference/primitiveConstraints1.types
+++ b/tests/baselines/reference/primitiveConstraints1.types
@@ -14,10 +14,10 @@ foo1<string, number>('hm', 1); // no error
 >                              : ^^^^
 >foo1 : <T extends U, U>(t: T, u: U) => void
 >     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
->'hm' : string
->     : ^^^^^^
->1 : number
->  : ^^^^^^
+>'hm' : "hm"
+>     : ^^^^
+>1 : 1
+>  : ^
  
 function foo2<T, U extends T>(t: T, u: U) { }
 >foo2 : <T, U extends T>(t: T, u: U) => void
@@ -32,8 +32,8 @@ foo2<number, string>(1, 'hm'); // error
 >                              : ^^^^
 >foo2 : <T, U extends T>(t: T, u: U) => void
 >     : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
->1 : number
->  : ^^^^^^
->'hm' : string
->     : ^^^^^^
+>1 : 1
+>  : ^
+>'hm' : "hm"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/primitiveConstraints2.types b/tests/baselines/reference/primitiveConstraints2.types
index 30df54df536..38a8c7e8d4c 100644
--- a/tests/baselines/reference/primitiveConstraints2.types
+++ b/tests/baselines/reference/primitiveConstraints2.types
@@ -34,10 +34,10 @@ x.bar2(2, ""); // should error
 >  : ^^^^^^^^^
 >bar2 : <U extends number>(x: number, y: U) => number
 >     : ^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>2 : 2
+>  : ^
+>"" : ""
+>   : ^^
 
 x.bar2<string>(2, ""); // should error
 >x.bar2<string>(2, "") : number
@@ -48,8 +48,8 @@ x.bar2<string>(2, ""); // should error
 >  : ^^^^^^^^^
 >bar2 : <U extends number>(x: number, y: U) => number
 >     : ^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"" : string
->   : ^^^^^^
+>2 : 2
+>  : ^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/privateNameAccessors.types b/tests/baselines/reference/privateNameAccessors.types
index 0aa120d7ee6..0284be38565 100644
--- a/tests/baselines/reference/privateNameAccessors.types
+++ b/tests/baselines/reference/privateNameAccessors.types
@@ -8,8 +8,8 @@ class A1 {
     get #prop() { return ""; }
 >#prop : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     set #prop(param: string) { }
 >#prop : string
@@ -28,14 +28,14 @@ class A1 {
 >     : ^^^^^^
 
         this.#prop = "";
->this.#prop = "" : string
->                : ^^^^^^
+>this.#prop = "" : ""
+>                : ^^
 >this.#prop : string
 >           : ^^^^^^
 >this : this
 >     : ^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         this.#roProp = ""; // Error
 >this.#roProp = "" : ""
diff --git a/tests/baselines/reference/privateNameAccessorsAccess.types b/tests/baselines/reference/privateNameAccessorsAccess.types
index 158cf9be70f..7bc0fa7eb96 100644
--- a/tests/baselines/reference/privateNameAccessorsAccess.types
+++ b/tests/baselines/reference/privateNameAccessorsAccess.types
@@ -8,8 +8,8 @@ class A2 {
     get #prop() { return ""; }
 >#prop : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     set #prop(param: string) { }
 >#prop : string
diff --git a/tests/baselines/reference/privateNameAccessorssDerivedClasses.types b/tests/baselines/reference/privateNameAccessorssDerivedClasses.types
index eaf3b1dc645..8a1a563b9aa 100644
--- a/tests/baselines/reference/privateNameAccessorssDerivedClasses.types
+++ b/tests/baselines/reference/privateNameAccessorssDerivedClasses.types
@@ -8,8 +8,8 @@ class Base {
     get #prop(): number { return  123; }
 >#prop : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     static method(x: Derived) {
 >method : (x: Derived) => void
diff --git a/tests/baselines/reference/privateNameComputedPropertyName1(target=es2015).types b/tests/baselines/reference/privateNameComputedPropertyName1(target=es2015).types
index 7e76186b338..4b492e9afc0 100644
--- a/tests/baselines/reference/privateNameComputedPropertyName1(target=es2015).types
+++ b/tests/baselines/reference/privateNameComputedPropertyName1(target=es2015).types
@@ -33,24 +33,24 @@ class A {
 
     constructor() {
         this.#b = 'b';
->this.#b = 'b' : string
->              : ^^^^^^
+>this.#b = 'b' : "b"
+>              : ^^^
 >this.#b : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
         this.#d = 'd';
->this.#d = 'd' : string
->              : ^^^^^^
+>this.#d = 'd' : "d"
+>              : ^^^
 >this.#d : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'d' : string
->    : ^^^^^^
+>'d' : "d"
+>    : ^^^
     }
 
     test() {
@@ -64,24 +64,24 @@ class A {
 >                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >b : string
 >  : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >c : string
 >  : ^^^^^^
->'c' : string
->    : ^^^^^^
+>'c' : "c"
+>    : ^^^
 >d : string
 >  : ^^^^^^
->'d' : string
->    : ^^^^^^
+>'d' : "d"
+>    : ^^^
 >e : string
 >  : ^^^^^^
->'e' : string
->    : ^^^^^^
+>'e' : "e"
+>    : ^^^
 
         const {
             [this.#a]: a,
@@ -117,14 +117,14 @@ class A {
 >  : ^^^^^^
 
             [this.#e = 'e']: e,
->this.#e = 'e' : string
->              : ^^^^^^
+>this.#e = 'e' : "e"
+>              : ^^^
 >this.#e : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'e' : string
->    : ^^^^^^
+>'e' : "e"
+>    : ^^^
 >e : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/privateNameComputedPropertyName1(target=es2022).types b/tests/baselines/reference/privateNameComputedPropertyName1(target=es2022).types
index 7e76186b338..4b492e9afc0 100644
--- a/tests/baselines/reference/privateNameComputedPropertyName1(target=es2022).types
+++ b/tests/baselines/reference/privateNameComputedPropertyName1(target=es2022).types
@@ -33,24 +33,24 @@ class A {
 
     constructor() {
         this.#b = 'b';
->this.#b = 'b' : string
->              : ^^^^^^
+>this.#b = 'b' : "b"
+>              : ^^^
 >this.#b : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
         this.#d = 'd';
->this.#d = 'd' : string
->              : ^^^^^^
+>this.#d = 'd' : "d"
+>              : ^^^
 >this.#d : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'d' : string
->    : ^^^^^^
+>'d' : "d"
+>    : ^^^
     }
 
     test() {
@@ -64,24 +64,24 @@ class A {
 >                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >b : string
 >  : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >c : string
 >  : ^^^^^^
->'c' : string
->    : ^^^^^^
+>'c' : "c"
+>    : ^^^
 >d : string
 >  : ^^^^^^
->'d' : string
->    : ^^^^^^
+>'d' : "d"
+>    : ^^^
 >e : string
 >  : ^^^^^^
->'e' : string
->    : ^^^^^^
+>'e' : "e"
+>    : ^^^
 
         const {
             [this.#a]: a,
@@ -117,14 +117,14 @@ class A {
 >  : ^^^^^^
 
             [this.#e = 'e']: e,
->this.#e = 'e' : string
->              : ^^^^^^
+>this.#e = 'e' : "e"
+>              : ^^^
 >this.#e : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'e' : string
->    : ^^^^^^
+>'e' : "e"
+>    : ^^^
 >e : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/privateNameComputedPropertyName1(target=esnext).types b/tests/baselines/reference/privateNameComputedPropertyName1(target=esnext).types
index 7e76186b338..4b492e9afc0 100644
--- a/tests/baselines/reference/privateNameComputedPropertyName1(target=esnext).types
+++ b/tests/baselines/reference/privateNameComputedPropertyName1(target=esnext).types
@@ -33,24 +33,24 @@ class A {
 
     constructor() {
         this.#b = 'b';
->this.#b = 'b' : string
->              : ^^^^^^
+>this.#b = 'b' : "b"
+>              : ^^^
 >this.#b : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 
         this.#d = 'd';
->this.#d = 'd' : string
->              : ^^^^^^
+>this.#d = 'd' : "d"
+>              : ^^^
 >this.#d : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'d' : string
->    : ^^^^^^
+>'d' : "d"
+>    : ^^^
     }
 
     test() {
@@ -64,24 +64,24 @@ class A {
 >                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >b : string
 >  : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'b' : "b"
+>    : ^^^
 >c : string
 >  : ^^^^^^
->'c' : string
->    : ^^^^^^
+>'c' : "c"
+>    : ^^^
 >d : string
 >  : ^^^^^^
->'d' : string
->    : ^^^^^^
+>'d' : "d"
+>    : ^^^
 >e : string
 >  : ^^^^^^
->'e' : string
->    : ^^^^^^
+>'e' : "e"
+>    : ^^^
 
         const {
             [this.#a]: a,
@@ -117,14 +117,14 @@ class A {
 >  : ^^^^^^
 
             [this.#e = 'e']: e,
->this.#e = 'e' : string
->              : ^^^^^^
+>this.#e = 'e' : "e"
+>              : ^^^
 >this.#e : string
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->'e' : string
->    : ^^^^^^
+>'e' : "e"
+>    : ^^^
 >e : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/privateNameConstructorSignature.types b/tests/baselines/reference/privateNameConstructorSignature.types
index e351b8f5b12..043fc7f7053 100644
--- a/tests/baselines/reference/privateNameConstructorSignature.types
+++ b/tests/baselines/reference/privateNameConstructorSignature.types
@@ -45,16 +45,16 @@ class C {
 >  : ^
 
         z.x = 123;
->z.x = 123 : number
->          : ^^^^^^
+>z.x = 123 : 123
+>          : ^^^
 >z.x : number
 >    : ^^^^^^
 >z : D
 >  : ^
 >x : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
     }
 }
 interface C {
diff --git a/tests/baselines/reference/privateNameDuplicateField.types b/tests/baselines/reference/privateNameDuplicateField.types
index 16598ce90f1..d4623b5b45a 100644
--- a/tests/baselines/reference/privateNameDuplicateField.types
+++ b/tests/baselines/reference/privateNameDuplicateField.types
@@ -340,8 +340,8 @@ function Getter() {
         get #foo() { return ""}
 >#foo : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         set #foo(value: string) { }
 >#foo : string
@@ -471,8 +471,8 @@ function Setter() {
         get #foo() { return ""}
 >#foo : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 
     // Error
@@ -969,8 +969,8 @@ function StaticGetter() {
         static get #foo() { return ""}
 >#foo : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         static set #foo(value: string) { }
 >#foo : string
@@ -1103,8 +1103,8 @@ function StaticSetter() {
         static get #foo() { return ""}
 >#foo : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 
     // Error
diff --git a/tests/baselines/reference/privateNameES5Ban.types b/tests/baselines/reference/privateNameES5Ban.types
index 0b690692795..b67296938a9 100644
--- a/tests/baselines/reference/privateNameES5Ban.types
+++ b/tests/baselines/reference/privateNameES5Ban.types
@@ -29,8 +29,8 @@ class A {
     get #acc() { return ""; }
 >#acc : string
 >     : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     set #acc(x: string) {}
 >#acc : string
@@ -41,8 +41,8 @@ class A {
     static get #sAcc() { return 0; }
 >#sAcc : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static set #sAcc(x: number) {}
 >#sAcc : number
diff --git a/tests/baselines/reference/privateNameEmitHelpers.types b/tests/baselines/reference/privateNameEmitHelpers.types
index a90ac5245a5..69f0d4f6a28 100644
--- a/tests/baselines/reference/privateNameEmitHelpers.types
+++ b/tests/baselines/reference/privateNameEmitHelpers.types
@@ -14,14 +14,14 @@ export class C {
     #b() { this.#c = 42; }
 >#b : () => void
 >   : ^^^^^^^^^^
->this.#c = 42 : number
->             : ^^^^^^
+>this.#c = 42 : 42
+>             : ^^
 >this.#c : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     set #c(v: number) { this.#a += v; }
 >#c : number
diff --git a/tests/baselines/reference/privateNameFieldAssignment.types b/tests/baselines/reference/privateNameFieldAssignment.types
index e4e5f0ae132..2a5cf10b3e7 100644
--- a/tests/baselines/reference/privateNameFieldAssignment.types
+++ b/tests/baselines/reference/privateNameFieldAssignment.types
@@ -13,14 +13,14 @@ class A {
 
     constructor() {
         this.#field = 1;
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.#field += 2;
 >this.#field += 2 : number
@@ -143,8 +143,8 @@ class A {
 >   : ^^
 
         A.getInstance().#field = 1;
->A.getInstance().#field = 1 : number
->                           : ^^^^^^
+>A.getInstance().#field = 1 : 1
+>                           : ^
 >A.getInstance().#field : number
 >                       : ^^^^^^
 >A.getInstance() : A
@@ -155,8 +155,8 @@ class A {
 >  : ^^^^^^^^
 >getInstance : () => A
 >            : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         A.getInstance().#field += 2;
 >A.getInstance().#field += 2 : number
diff --git a/tests/baselines/reference/privateNameFieldDerivedClasses.types b/tests/baselines/reference/privateNameFieldDerivedClasses.types
index 45da8cba0ba..6b58b8d4b2d 100644
--- a/tests/baselines/reference/privateNameFieldDerivedClasses.types
+++ b/tests/baselines/reference/privateNameFieldDerivedClasses.types
@@ -8,8 +8,8 @@ class Base {
     #prop: number = 123;
 >#prop : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     static method(x: Derived) {
 >method : (x: Derived) => void
diff --git a/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2015).types b/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2015).types
index 372476232f1..85dfe8b55f6 100644
--- a/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2015).types
+++ b/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2015).types
@@ -123,14 +123,14 @@ class A {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         [this.#field, [this.#field]] = [1, [2]];
 >[this.#field, [this.#field]] = [1, [2]] : [number, [number]]
@@ -149,12 +149,12 @@ class A {
 >     : ^^^^
 >[1, [2]] : [number, [number]]
 >         : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ({ a: this.#field = 1, b: [this.#field = 1] } = { b: [] });
 >({ a: this.#field = 1, b: [this.#field = 1] } = { b: [] }) : { b: []; a?: number; }
@@ -165,26 +165,26 @@ class A {
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[this.#field = 1] : [number]
 >                  : ^^^^^^^^
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: [] } : { b: []; a?: number; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^
 >b : []
@@ -197,14 +197,14 @@ class A {
 >                       : ^^
 >[this.#field = 2] : [number]
 >                  : ^^^^^^^^
->this.#field = 2 : number
->                : ^^^^^^
+>this.#field = 2 : 2
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
 
@@ -213,8 +213,8 @@ class A {
 >                                   : ^^
 >[this.otherObject.#field = 2] : [number]
 >                              : ^^^^^^^^
->this.otherObject.#field = 2 : number
->                            : ^^^^^^
+>this.otherObject.#field = 2 : 2
+>                            : ^
 >this.otherObject.#field : number
 >                        : ^^^^^^
 >this.otherObject : A
@@ -223,8 +223,8 @@ class A {
 >     : ^^^^
 >otherObject : A
 >            : ^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
     }
@@ -245,8 +245,8 @@ class A {
 >   : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2022).types b/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2022).types
index 372476232f1..85dfe8b55f6 100644
--- a/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2022).types
+++ b/tests/baselines/reference/privateNameFieldDestructuredBinding(target=es2022).types
@@ -123,14 +123,14 @@ class A {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         [this.#field, [this.#field]] = [1, [2]];
 >[this.#field, [this.#field]] = [1, [2]] : [number, [number]]
@@ -149,12 +149,12 @@ class A {
 >     : ^^^^
 >[1, [2]] : [number, [number]]
 >         : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ({ a: this.#field = 1, b: [this.#field = 1] } = { b: [] });
 >({ a: this.#field = 1, b: [this.#field = 1] } = { b: [] }) : { b: []; a?: number; }
@@ -165,26 +165,26 @@ class A {
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[this.#field = 1] : [number]
 >                  : ^^^^^^^^
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: [] } : { b: []; a?: number; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^
 >b : []
@@ -197,14 +197,14 @@ class A {
 >                       : ^^
 >[this.#field = 2] : [number]
 >                  : ^^^^^^^^
->this.#field = 2 : number
->                : ^^^^^^
+>this.#field = 2 : 2
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
 
@@ -213,8 +213,8 @@ class A {
 >                                   : ^^
 >[this.otherObject.#field = 2] : [number]
 >                              : ^^^^^^^^
->this.otherObject.#field = 2 : number
->                            : ^^^^^^
+>this.otherObject.#field = 2 : 2
+>                            : ^
 >this.otherObject.#field : number
 >                        : ^^^^^^
 >this.otherObject : A
@@ -223,8 +223,8 @@ class A {
 >     : ^^^^
 >otherObject : A
 >            : ^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
     }
@@ -245,8 +245,8 @@ class A {
 >   : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameFieldDestructuredBinding(target=esnext).types b/tests/baselines/reference/privateNameFieldDestructuredBinding(target=esnext).types
index 372476232f1..85dfe8b55f6 100644
--- a/tests/baselines/reference/privateNameFieldDestructuredBinding(target=esnext).types
+++ b/tests/baselines/reference/privateNameFieldDestructuredBinding(target=esnext).types
@@ -123,14 +123,14 @@ class A {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         [this.#field, [this.#field]] = [1, [2]];
 >[this.#field, [this.#field]] = [1, [2]] : [number, [number]]
@@ -149,12 +149,12 @@ class A {
 >     : ^^^^
 >[1, [2]] : [number, [number]]
 >         : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ({ a: this.#field = 1, b: [this.#field = 1] } = { b: [] });
 >({ a: this.#field = 1, b: [this.#field = 1] } = { b: [] }) : { b: []; a?: number; }
@@ -165,26 +165,26 @@ class A {
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[this.#field = 1] : [number]
 >                  : ^^^^^^^^
->this.#field = 1 : number
->                : ^^^^^^
+>this.#field = 1 : 1
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: [] } : { b: []; a?: number; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^
 >b : []
@@ -197,14 +197,14 @@ class A {
 >                       : ^^
 >[this.#field = 2] : [number]
 >                  : ^^^^^^^^
->this.#field = 2 : number
->                : ^^^^^^
+>this.#field = 2 : 2
+>                : ^
 >this.#field : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
 
@@ -213,8 +213,8 @@ class A {
 >                                   : ^^
 >[this.otherObject.#field = 2] : [number]
 >                              : ^^^^^^^^
->this.otherObject.#field = 2 : number
->                            : ^^^^^^
+>this.otherObject.#field = 2 : 2
+>                            : ^
 >this.otherObject.#field : number
 >                        : ^^^^^^
 >this.otherObject : A
@@ -223,8 +223,8 @@ class A {
 >     : ^^^^
 >otherObject : A
 >            : ^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
     }
@@ -245,8 +245,8 @@ class A {
 >   : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameFieldUnaryMutation.types b/tests/baselines/reference/privateNameFieldUnaryMutation.types
index dec54d50d32..7486dbb01c0 100644
--- a/tests/baselines/reference/privateNameFieldUnaryMutation.types
+++ b/tests/baselines/reference/privateNameFieldUnaryMutation.types
@@ -8,8 +8,8 @@ class C {
     #test: number = 24;
 >#test : number
 >      : ^^^^^^
->24 : number
->   : ^^^^^^
+>24 : 24
+>   : ^^
 
     constructor() {
         this.#test++;
@@ -85,14 +85,14 @@ class C {
 >     : ^^^^
 
         for (this.#test = 0; this.#test < 10; ++this.#test) {}
->this.#test = 0 : number
->               : ^^^^^^
+>this.#test = 0 : 0
+>               : ^
 >this.#test : number
 >           : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.#test < 10 : boolean
 >                : ^^^^^^^
 >this.#test : number
@@ -109,14 +109,14 @@ class C {
 >     : ^^^^
 
         for (this.#test = 0; this.#test < 10; this.#test++) {}
->this.#test = 0 : number
->               : ^^^^^^
+>this.#test = 0 : 0
+>               : ^
 >this.#test : number
 >           : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.#test < 10 : boolean
 >                : ^^^^^^^
 >this.#test : number
@@ -221,14 +221,14 @@ class C {
 >     : ^^^^
 
         for (this.#test = 0; this.#test < 10; ++(this.#test)) {}
->this.#test = 0 : number
->               : ^^^^^^
+>this.#test = 0 : 0
+>               : ^
 >this.#test : number
 >           : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.#test < 10 : boolean
 >                : ^^^^^^^
 >this.#test : number
@@ -247,14 +247,14 @@ class C {
 >     : ^^^^
 
         for (this.#test = 0; this.#test < 10; (this.#test)++) {}
->this.#test = 0 : number
->               : ^^^^^^
+>this.#test = 0 : 0
+>               : ^
 >this.#test : number
 >           : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.#test < 10 : boolean
 >                : ^^^^^^^
 >this.#test : number
@@ -397,8 +397,8 @@ class C {
 >            : ^^^^^^^
 
         for (this.getInstance().#test = 0; this.getInstance().#test < 10; ++this.getInstance().#test) {}
->this.getInstance().#test = 0 : number
->                             : ^^^^^^
+>this.getInstance().#test = 0 : 0
+>                             : ^
 >this.getInstance().#test : number
 >                         : ^^^^^^
 >this.getInstance() : C
@@ -409,8 +409,8 @@ class C {
 >     : ^^^^
 >getInstance : () => C
 >            : ^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.getInstance().#test < 10 : boolean
 >                              : ^^^^^^^
 >this.getInstance().#test : number
@@ -439,8 +439,8 @@ class C {
 >            : ^^^^^^^
 
         for (this.getInstance().#test = 0; this.getInstance().#test < 10; this.getInstance().#test++) {}
->this.getInstance().#test = 0 : number
->                             : ^^^^^^
+>this.getInstance().#test = 0 : 0
+>                             : ^
 >this.getInstance().#test : number
 >                         : ^^^^^^
 >this.getInstance() : C
@@ -451,8 +451,8 @@ class C {
 >     : ^^^^
 >getInstance : () => C
 >            : ^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.getInstance().#test < 10 : boolean
 >                              : ^^^^^^^
 >this.getInstance().#test : number
@@ -617,8 +617,8 @@ class C {
 >            : ^^^^^^^
 
         for (this.getInstance().#test = 0; this.getInstance().#test < 10; ++(this.getInstance().#test)) {}
->this.getInstance().#test = 0 : number
->                             : ^^^^^^
+>this.getInstance().#test = 0 : 0
+>                             : ^
 >this.getInstance().#test : number
 >                         : ^^^^^^
 >this.getInstance() : C
@@ -629,8 +629,8 @@ class C {
 >     : ^^^^
 >getInstance : () => C
 >            : ^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.getInstance().#test < 10 : boolean
 >                              : ^^^^^^^
 >this.getInstance().#test : number
@@ -661,8 +661,8 @@ class C {
 >            : ^^^^^^^
 
         for (this.getInstance().#test = 0; this.getInstance().#test < 10; (this.getInstance().#test)++) {}
->this.getInstance().#test = 0 : number
->                             : ^^^^^^
+>this.getInstance().#test = 0 : 0
+>                             : ^
 >this.getInstance().#test : number
 >                         : ^^^^^^
 >this.getInstance() : C
@@ -673,8 +673,8 @@ class C {
 >     : ^^^^
 >getInstance : () => C
 >            : ^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.getInstance().#test < 10 : boolean
 >                              : ^^^^^^^
 >this.getInstance().#test : number
diff --git a/tests/baselines/reference/privateNameFieldsESNext(target=es2022).types b/tests/baselines/reference/privateNameFieldsESNext(target=es2022).types
index 306023aa838..048ccd7c399 100644
--- a/tests/baselines/reference/privateNameFieldsESNext(target=es2022).types
+++ b/tests/baselines/reference/privateNameFieldsESNext(target=es2022).types
@@ -46,14 +46,14 @@ class C {
 >     : ^^^^
 
         this.#a = "hello";
->this.#a = "hello" : string
->                  : ^^^^^^
+>this.#a = "hello" : "hello"
+>                  : ^^^^^^^
 >this.#a : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         console.log(this.#b);
 >console.log(this.#b) : void
diff --git a/tests/baselines/reference/privateNameFieldsESNext(target=esnext).types b/tests/baselines/reference/privateNameFieldsESNext(target=esnext).types
index 306023aa838..048ccd7c399 100644
--- a/tests/baselines/reference/privateNameFieldsESNext(target=esnext).types
+++ b/tests/baselines/reference/privateNameFieldsESNext(target=esnext).types
@@ -46,14 +46,14 @@ class C {
 >     : ^^^^
 
         this.#a = "hello";
->this.#a = "hello" : string
->                  : ^^^^^^
+>this.#a = "hello" : "hello"
+>                  : ^^^^^^^
 >this.#a : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         console.log(this.#b);
 >console.log(this.#b) : void
diff --git a/tests/baselines/reference/privateNameInLhsReceiverExpression.types b/tests/baselines/reference/privateNameInLhsReceiverExpression.types
index 303c312aa3c..dfd84184309 100644
--- a/tests/baselines/reference/privateNameInLhsReceiverExpression.types
+++ b/tests/baselines/reference/privateNameInLhsReceiverExpression.types
@@ -20,8 +20,8 @@ class Test {
 >    : ^^^^^^
 
         obj[(new class { #x = 1; readonly s = "prop"; }).s].#y = 1;
->obj[(new class { #x = 1; readonly s = "prop"; }).s].#y = 1 : number
->                                                           : ^^^^^^
+>obj[(new class { #x = 1; readonly s = "prop"; }).s].#y = 1 : 1
+>                                                           : ^
 >obj[(new class { #x = 1; readonly s = "prop"; }).s].#y : number
 >                                                       : ^^^^^^
 >obj[(new class { #x = 1; readonly s = "prop"; }).s] : Test
@@ -46,8 +46,8 @@ class Test {
 >       : ^^^^^^
 >s : "prop"
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         obj[(new class { #x = 1; readonly s = "prop"; }).s].#y += 1;
 >obj[(new class { #x = 1; readonly s = "prop"; }).s].#y += 1 : number
diff --git a/tests/baselines/reference/privateNameMethod.types b/tests/baselines/reference/privateNameMethod.types
index 6270e807aea..e7d65ef794c 100644
--- a/tests/baselines/reference/privateNameMethod.types
+++ b/tests/baselines/reference/privateNameMethod.types
@@ -12,8 +12,8 @@ class A1 {
 >      : ^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     constructor(name: string) {
 >name : string
@@ -26,8 +26,8 @@ class A1 {
 >             : ^     ^^      ^^^^^      
 >this : this
 >     : ^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         this.#method(1) // Error
 >this.#method(1) : string
@@ -36,8 +36,8 @@ class A1 {
 >             : ^     ^^      ^^^^^      
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.#method()  // Error 
 >this.#method() : string
diff --git a/tests/baselines/reference/privateNameMethodAsync.types b/tests/baselines/reference/privateNameMethodAsync.types
index 0a50a79412f..5f7f74f19b0 100644
--- a/tests/baselines/reference/privateNameMethodAsync.types
+++ b/tests/baselines/reference/privateNameMethodAsync.types
@@ -20,8 +20,8 @@ const C = class {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     async foo() {
 >foo : () => Promise<number>
@@ -120,8 +120,8 @@ const C = class {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameMethodCallExpression.types b/tests/baselines/reference/privateNameMethodCallExpression.types
index 35981d762c5..d4aab0f3fcc 100644
--- a/tests/baselines/reference/privateNameMethodCallExpression.types
+++ b/tests/baselines/reference/privateNameMethodCallExpression.types
@@ -8,16 +8,16 @@ class AA {
     #method() { this.x = 10; };
 >#method : () => void
 >        : ^^^^^^^^^^
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     #method2(a, ...b) {};
 >#method2 : (a: any, ...b: any[]) => void
diff --git a/tests/baselines/reference/privateNameMethodsDerivedClasses.types b/tests/baselines/reference/privateNameMethodsDerivedClasses.types
index dbb9d5fa419..06cd43078fa 100644
--- a/tests/baselines/reference/privateNameMethodsDerivedClasses.types
+++ b/tests/baselines/reference/privateNameMethodsDerivedClasses.types
@@ -8,8 +8,8 @@ class Base {
     #prop(): number{ return  123; }
 >#prop : () => number
 >      : ^^^^^^      
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     static method(x: Derived) {
 >method : (x: Derived) => void
diff --git a/tests/baselines/reference/privateNameNotAccessibleOutsideDefiningClass.types b/tests/baselines/reference/privateNameNotAccessibleOutsideDefiningClass.types
index 897d3c01050..63f5589b330 100644
--- a/tests/baselines/reference/privateNameNotAccessibleOutsideDefiningClass.types
+++ b/tests/baselines/reference/privateNameNotAccessibleOutsideDefiningClass.types
@@ -8,8 +8,8 @@ class A {
     #foo: number = 3;
 >#foo : number
 >     : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 }
 
 new A().#foo = 4;               // Error
diff --git a/tests/baselines/reference/privateNameStaticAccessors.types b/tests/baselines/reference/privateNameStaticAccessors.types
index 22ed26d7033..cc3963df875 100644
--- a/tests/baselines/reference/privateNameStaticAccessors.types
+++ b/tests/baselines/reference/privateNameStaticAccessors.types
@@ -8,8 +8,8 @@ class A1 {
     static get #prop() { return ""; }
 >#prop : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     static set #prop(param: string) { }
 >#prop : string
@@ -28,14 +28,14 @@ class A1 {
 >     : ^^^^^^
 
         A1.#prop = "";
->A1.#prop = "" : string
->              : ^^^^^^
+>A1.#prop = "" : ""
+>              : ^^
 >A1.#prop : string
 >         : ^^^^^^
 >A1 : typeof A1
 >   : ^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         A1.#roProp = ""; // Error
 >A1.#roProp = "" : ""
diff --git a/tests/baselines/reference/privateNameStaticAccessorsAccess.types b/tests/baselines/reference/privateNameStaticAccessorsAccess.types
index b3eaf24d2eb..c0cc982d7d4 100644
--- a/tests/baselines/reference/privateNameStaticAccessorsAccess.types
+++ b/tests/baselines/reference/privateNameStaticAccessorsAccess.types
@@ -9,8 +9,8 @@ class A2 {
     static get #prop() { return ""; }
 >#prop : string
 >      : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     static set #prop(param: string) { }
 >#prop : string
diff --git a/tests/baselines/reference/privateNameStaticAccessorsCallExpression.types b/tests/baselines/reference/privateNameStaticAccessorsCallExpression.types
index 00159915db2..24f7392beea 100644
--- a/tests/baselines/reference/privateNameStaticAccessorsCallExpression.types
+++ b/tests/baselines/reference/privateNameStaticAccessorsCallExpression.types
@@ -10,14 +10,14 @@ class A {
 >           : ^^^^^^^^^^
 >function() { A.#x = 10; } : () => void
 >                          : ^^^^^^^^^^
->A.#x = 10 : number
->          : ^^^^^^
+>A.#x = 10 : 10
+>          : ^^
 >A.#x : number
 >     : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     static get #fieldFunc2() { return  function(a, ...b) {}; }
 >#fieldFunc2 : (a: any, ...b: any[]) => void
diff --git a/tests/baselines/reference/privateNameStaticAccessorssDerivedClasses.types b/tests/baselines/reference/privateNameStaticAccessorssDerivedClasses.types
index ae6964d690f..244cf67c533 100644
--- a/tests/baselines/reference/privateNameStaticAccessorssDerivedClasses.types
+++ b/tests/baselines/reference/privateNameStaticAccessorssDerivedClasses.types
@@ -8,8 +8,8 @@ class Base {
     static get #prop(): number { return  123; }
 >#prop : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     static method(x: typeof Derived) {
 >method : (x: typeof Derived) => void
diff --git a/tests/baselines/reference/privateNameStaticEmitHelpers.types b/tests/baselines/reference/privateNameStaticEmitHelpers.types
index b81f3698f47..2cf321bb0a7 100644
--- a/tests/baselines/reference/privateNameStaticEmitHelpers.types
+++ b/tests/baselines/reference/privateNameStaticEmitHelpers.types
@@ -14,14 +14,14 @@ export class S {
     static #b() { this.#a = 42; }
 >#b : () => void
 >   : ^^^^^^^^^^
->this.#a = 42 : number
->             : ^^^^^^
+>this.#a = 42 : 42
+>             : ^^
 >this.#a : number
 >        : ^^^^^^
 >this : typeof S
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     static get #c() { return S.#b(); }
 >#c : void
diff --git a/tests/baselines/reference/privateNameStaticFieldAssignment.types b/tests/baselines/reference/privateNameStaticFieldAssignment.types
index dbe2415e672..0369da5ba6e 100644
--- a/tests/baselines/reference/privateNameStaticFieldAssignment.types
+++ b/tests/baselines/reference/privateNameStaticFieldAssignment.types
@@ -13,14 +13,14 @@ class A {
 
     constructor() {
         A.#field = 1;
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         A.#field += 2;
 >A.#field += 2 : number
@@ -143,8 +143,8 @@ class A {
 >   : ^^
 
         A.getClass().#field = 1;
->A.getClass().#field = 1 : number
->                        : ^^^^^^
+>A.getClass().#field = 1 : 1
+>                        : ^
 >A.getClass().#field : number
 >                    : ^^^^^^
 >A.getClass() : typeof A
@@ -155,8 +155,8 @@ class A {
 >  : ^^^^^^^^
 >getClass : () => typeof A
 >         : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         A.getClass().#field += 2;
 >A.getClass().#field += 2 : number
diff --git a/tests/baselines/reference/privateNameStaticFieldClassExpression.types b/tests/baselines/reference/privateNameStaticFieldClassExpression.types
index f1ecf7dde3a..2f809625aba 100644
--- a/tests/baselines/reference/privateNameStaticFieldClassExpression.types
+++ b/tests/baselines/reference/privateNameStaticFieldClassExpression.types
@@ -84,8 +84,8 @@ class B {
 >     : ^^^^^^
 
         B.#foo.test = 10;
->B.#foo.test = 10 : number
->                 : ^^^^^^
+>B.#foo.test = 10 : 10
+>                 : ^^
 >B.#foo.test : number
 >            : ^^^^^^
 >B.#foo : typeof (Anonymous class)
@@ -94,8 +94,8 @@ class B {
 >  : ^^^^^^^^
 >test : number
 >     : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         new B.#foo().field;
 >new B.#foo().field : number
diff --git a/tests/baselines/reference/privateNameStaticFieldDerivedClasses.types b/tests/baselines/reference/privateNameStaticFieldDerivedClasses.types
index aaf89001301..3df1971bcbc 100644
--- a/tests/baselines/reference/privateNameStaticFieldDerivedClasses.types
+++ b/tests/baselines/reference/privateNameStaticFieldDerivedClasses.types
@@ -8,8 +8,8 @@ class Base {
     static #prop: number = 123;
 >#prop : number
 >      : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     static method(x: Derived) {
 >method : (x: Derived) => void
@@ -24,14 +24,14 @@ class Base {
 >        : ^^^^^^^^^^^^^^
 
         Base.#prop  = 10;
->Base.#prop  = 10 : number
->                 : ^^^^^^
+>Base.#prop  = 10 : 10
+>                 : ^^
 >Base.#prop : number
 >           : ^^^^^^
 >Base : typeof Base
 >     : ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
 }
 class Derived extends Base {
@@ -43,8 +43,8 @@ class Derived extends Base {
     static #derivedProp: number = 10;
 >#derivedProp : number
 >             : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     static method(x: Derived) {
 >method : (x: Derived) => void
diff --git a/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2015).types b/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2015).types
index 4e988d72728..3141d2ef0de 100644
--- a/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2015).types
+++ b/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2015).types
@@ -121,14 +121,14 @@ class A {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         [A.#field, [A.#field]] = [1, [2]];
 >[A.#field, [A.#field]] = [1, [2]] : [number, [number]]
@@ -147,12 +147,12 @@ class A {
 >  : ^^^^^^^^
 >[1, [2]] : [number, [number]]
 >         : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ({ a: A.#field = 1, b: [A.#field = 1] } = { b: [] });
 >({ a: A.#field = 1, b: [A.#field = 1] } = { b: [] }) : { b: []; a?: number; }
@@ -163,26 +163,26 @@ class A {
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[A.#field = 1] : [number]
 >               : ^^^^^^^^
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: [] } : { b: []; a?: number; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^
 >b : []
@@ -195,14 +195,14 @@ class A {
 >                    : ^^
 >[A.#field = 2] : [number]
 >               : ^^^^^^^^
->A.#field = 2 : number
->             : ^^^^^^
+>A.#field = 2 : 2
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
 
@@ -211,8 +211,8 @@ class A {
 >                                  : ^^
 >[this.otherClass.#field = 2] : [number]
 >                             : ^^^^^^^^
->this.otherClass.#field = 2 : number
->                           : ^^^^^^
+>this.otherClass.#field = 2 : 2
+>                           : ^
 >this.otherClass.#field : number
 >                       : ^^^^^^
 >this.otherClass : typeof A
@@ -221,8 +221,8 @@ class A {
 >     : ^^^^
 >otherClass : typeof A
 >           : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
     }
@@ -245,8 +245,8 @@ class A {
 >   : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2022).types b/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2022).types
index 4e988d72728..3141d2ef0de 100644
--- a/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2022).types
+++ b/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=es2022).types
@@ -121,14 +121,14 @@ class A {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         [A.#field, [A.#field]] = [1, [2]];
 >[A.#field, [A.#field]] = [1, [2]] : [number, [number]]
@@ -147,12 +147,12 @@ class A {
 >  : ^^^^^^^^
 >[1, [2]] : [number, [number]]
 >         : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ({ a: A.#field = 1, b: [A.#field = 1] } = { b: [] });
 >({ a: A.#field = 1, b: [A.#field = 1] } = { b: [] }) : { b: []; a?: number; }
@@ -163,26 +163,26 @@ class A {
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[A.#field = 1] : [number]
 >               : ^^^^^^^^
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: [] } : { b: []; a?: number; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^
 >b : []
@@ -195,14 +195,14 @@ class A {
 >                    : ^^
 >[A.#field = 2] : [number]
 >               : ^^^^^^^^
->A.#field = 2 : number
->             : ^^^^^^
+>A.#field = 2 : 2
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
 
@@ -211,8 +211,8 @@ class A {
 >                                  : ^^
 >[this.otherClass.#field = 2] : [number]
 >                             : ^^^^^^^^
->this.otherClass.#field = 2 : number
->                           : ^^^^^^
+>this.otherClass.#field = 2 : 2
+>                           : ^
 >this.otherClass.#field : number
 >                       : ^^^^^^
 >this.otherClass : typeof A
@@ -221,8 +221,8 @@ class A {
 >     : ^^^^
 >otherClass : typeof A
 >           : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
     }
@@ -245,8 +245,8 @@ class A {
 >   : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=esnext).types b/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=esnext).types
index 4e988d72728..3141d2ef0de 100644
--- a/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=esnext).types
+++ b/tests/baselines/reference/privateNameStaticFieldDestructuredBinding(target=esnext).types
@@ -121,14 +121,14 @@ class A {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         [A.#field, [A.#field]] = [1, [2]];
 >[A.#field, [A.#field]] = [1, [2]] : [number, [number]]
@@ -147,12 +147,12 @@ class A {
 >  : ^^^^^^^^
 >[1, [2]] : [number, [number]]
 >         : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
         ({ a: A.#field = 1, b: [A.#field = 1] } = { b: [] });
 >({ a: A.#field = 1, b: [A.#field = 1] } = { b: [] }) : { b: []; a?: number; }
@@ -163,26 +163,26 @@ class A {
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : [number]
 >  : ^^^^^^^^
 >[A.#field = 1] : [number]
 >               : ^^^^^^^^
->A.#field = 1 : number
->             : ^^^^^^
+>A.#field = 1 : 1
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ b: [] } : { b: []; a?: number; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^
 >b : []
@@ -195,14 +195,14 @@ class A {
 >                    : ^^
 >[A.#field = 2] : [number]
 >               : ^^^^^^^^
->A.#field = 2 : number
->             : ^^^^^^
+>A.#field = 2 : 2
+>             : ^
 >A.#field : number
 >         : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
 
@@ -211,8 +211,8 @@ class A {
 >                                  : ^^
 >[this.otherClass.#field = 2] : [number]
 >                             : ^^^^^^^^
->this.otherClass.#field = 2 : number
->                           : ^^^^^^
+>this.otherClass.#field = 2 : 2
+>                           : ^
 >this.otherClass.#field : number
 >                       : ^^^^^^
 >this.otherClass : typeof A
@@ -221,8 +221,8 @@ class A {
 >     : ^^^^
 >otherClass : typeof A
 >           : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >[] : []
 >   : ^^
     }
@@ -245,8 +245,8 @@ class A {
 >   : ^^^^^^^^
 >[2] : [number]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameStaticFieldUnaryMutation.types b/tests/baselines/reference/privateNameStaticFieldUnaryMutation.types
index fefaf6e273f..60a111c53e2 100644
--- a/tests/baselines/reference/privateNameStaticFieldUnaryMutation.types
+++ b/tests/baselines/reference/privateNameStaticFieldUnaryMutation.types
@@ -8,8 +8,8 @@ class C {
     static #test: number = 24;
 >#test : number
 >      : ^^^^^^
->24 : number
->   : ^^^^^^
+>24 : 24
+>   : ^^
 
     constructor() {
         C.#test++;
@@ -85,14 +85,14 @@ class C {
 >  : ^^^^^^^^
 
         for (C.#test = 0; C.#test < 10; ++C.#test) {}
->C.#test = 0 : number
->            : ^^^^^^
+>C.#test = 0 : 0
+>            : ^
 >C.#test : number
 >        : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >C.#test < 10 : boolean
 >             : ^^^^^^^
 >C.#test : number
@@ -109,14 +109,14 @@ class C {
 >  : ^^^^^^^^
 
         for (C.#test = 0; C.#test < 10; C.#test++) {}
->C.#test = 0 : number
->            : ^^^^^^
+>C.#test = 0 : 0
+>            : ^
 >C.#test : number
 >        : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >C.#test < 10 : boolean
 >             : ^^^^^^^
 >C.#test : number
@@ -257,8 +257,8 @@ class C {
 >         : ^^^^^^^^^^^^^^
 
         for (this.getClass().#test = 0; this.getClass().#test < 10; ++this.getClass().#test) {}
->this.getClass().#test = 0 : number
->                          : ^^^^^^
+>this.getClass().#test = 0 : 0
+>                          : ^
 >this.getClass().#test : number
 >                      : ^^^^^^
 >this.getClass() : typeof C
@@ -269,8 +269,8 @@ class C {
 >     : ^^^^
 >getClass : () => typeof C
 >         : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.getClass().#test < 10 : boolean
 >                           : ^^^^^^^
 >this.getClass().#test : number
@@ -299,8 +299,8 @@ class C {
 >         : ^^^^^^^^^^^^^^
 
         for (this.getClass().#test = 0; this.getClass().#test < 10; this.getClass().#test++) {}
->this.getClass().#test = 0 : number
->                          : ^^^^^^
+>this.getClass().#test = 0 : 0
+>                          : ^
 >this.getClass().#test : number
 >                      : ^^^^^^
 >this.getClass() : typeof C
@@ -311,8 +311,8 @@ class C {
 >     : ^^^^
 >getClass : () => typeof C
 >         : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >this.getClass().#test < 10 : boolean
 >                           : ^^^^^^^
 >this.getClass().#test : number
diff --git a/tests/baselines/reference/privateNameStaticMethod.types b/tests/baselines/reference/privateNameStaticMethod.types
index a88e03889df..b016e3dd653 100644
--- a/tests/baselines/reference/privateNameStaticMethod.types
+++ b/tests/baselines/reference/privateNameStaticMethod.types
@@ -12,8 +12,8 @@ class A1 {
 >      : ^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     constructor() {
         A1.#method("")
@@ -23,8 +23,8 @@ class A1 {
 >           : ^     ^^      ^^^^^      
 >A1 : typeof A1
 >   : ^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         A1.#method(1) // Error
 >A1.#method(1) : string
@@ -33,8 +33,8 @@ class A1 {
 >           : ^     ^^      ^^^^^      
 >A1 : typeof A1
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         A1.#method()  // Error 
 >A1.#method() : string
diff --git a/tests/baselines/reference/privateNameStaticMethodAsync.types b/tests/baselines/reference/privateNameStaticMethodAsync.types
index 47692348083..ddb582f2174 100644
--- a/tests/baselines/reference/privateNameStaticMethodAsync.types
+++ b/tests/baselines/reference/privateNameStaticMethodAsync.types
@@ -20,8 +20,8 @@ const C = class {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     static async foo() {
 >foo : () => Promise<number>
@@ -122,8 +122,8 @@ const C = class {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
     async static *#bazBad() { yield 42; }
 >#bazBad : () => AsyncGenerator<number, void, unknown>
diff --git a/tests/baselines/reference/privateNameStaticMethodCallExpression.types b/tests/baselines/reference/privateNameStaticMethodCallExpression.types
index b99b6664fc3..88e18259c62 100644
--- a/tests/baselines/reference/privateNameStaticMethodCallExpression.types
+++ b/tests/baselines/reference/privateNameStaticMethodCallExpression.types
@@ -8,16 +8,16 @@ class AA {
     static #method() { this.x = 10; };
 >#method : () => void
 >        : ^^^^^^^^^^
->this.x = 10 : number
->            : ^^^^^^
+>this.x = 10 : 10
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : typeof AA
 >     : ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     static #method2(a, ...b) {};
 >#method2 : (a: any, ...b: any[]) => void
diff --git a/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=es2022).types b/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=es2022).types
index 9714980da53..8ea396d499e 100644
--- a/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=es2022).types
+++ b/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=es2022).types
@@ -65,8 +65,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -75,8 +75,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -85,8 +85,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#quux = A.#quux + 1;
 >A.#quux = A.#quux + 1 : number
@@ -140,8 +140,8 @@ class B extends A {
 >       : ^ ^^      ^^^^^^^^^
 >B : typeof B
 >  : ^^^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=esnext).types b/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=esnext).types
index 9714980da53..8ea396d499e 100644
--- a/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=esnext).types
+++ b/tests/baselines/reference/privateNameStaticsAndStaticMethods(target=esnext).types
@@ -65,8 +65,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -75,8 +75,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -85,8 +85,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#quux = A.#quux + 1;
 >A.#quux = A.#quux + 1 : number
@@ -140,8 +140,8 @@ class B extends A {
 >       : ^ ^^      ^^^^^^^^^
 >B : typeof B
 >  : ^^^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNameUnused.types b/tests/baselines/reference/privateNameUnused.types
index 9b466d904e9..fad2e287609 100644
--- a/tests/baselines/reference/privateNameUnused.types
+++ b/tests/baselines/reference/privateNameUnused.types
@@ -72,8 +72,8 @@ export class A3 {
     get #used() { return 0 };
 >#used : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set #used(value: number) {  };
 >#used : number
@@ -84,8 +84,8 @@ export class A3 {
     get #unused() { return 0 };
 >#unused : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set #unused(value: number) {  };
 >#unused : number
diff --git a/tests/baselines/reference/privateNamesAndFields.types b/tests/baselines/reference/privateNamesAndFields.types
index 46e5830de5e..135b735f9a6 100644
--- a/tests/baselines/reference/privateNamesAndFields.types
+++ b/tests/baselines/reference/privateNamesAndFields.types
@@ -11,14 +11,14 @@ class A {
 
     constructor () {
         this.#foo = 3;
->this.#foo = 3 : number
->              : ^^^^^^
+>this.#foo = 3 : 3
+>              : ^
 >this.#foo : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 }
 
@@ -40,14 +40,14 @@ class B extends A {
 >      : ^^^^^^^^
 
         this.#foo = "some string";
->this.#foo = "some string" : string
->                          : ^^^^^^
+>this.#foo = "some string" : "some string"
+>                          : ^^^^^^^^^^^^^
 >this.#foo : string
 >          : ^^^^^^
 >this : this
 >     : ^^^^
->"some string" : string
->              : ^^^^^^
+>"some string" : "some string"
+>              : ^^^^^^^^^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNamesAndGenericClasses-2.types b/tests/baselines/reference/privateNamesAndGenericClasses-2.types
index cc99102e1cb..a60c858771b 100644
--- a/tests/baselines/reference/privateNamesAndGenericClasses-2.types
+++ b/tests/baselines/reference/privateNamesAndGenericClasses-2.types
@@ -81,8 +81,8 @@ let a = new C(3);
 >         : ^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 let b = new C("hello");
 >b : C<string>
@@ -91,20 +91,20 @@ let b = new C("hello");
 >               : ^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 a.baz = 5                                 // OK
->a.baz = 5 : number
->          : ^^^^^^
+>a.baz = 5 : 5
+>          : ^
 >a.baz : number
 >      : ^^^^^^
 >a : C<number>
 >  : ^^^^^^^^^
 >baz : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 const x: number = a.baz                   // OK
 >x : number
diff --git a/tests/baselines/reference/privateNamesAndIndexedAccess.types b/tests/baselines/reference/privateNamesAndIndexedAccess.types
index 68868de8ca5..f497fe963d3 100644
--- a/tests/baselines/reference/privateNamesAndIndexedAccess.types
+++ b/tests/baselines/reference/privateNamesAndIndexedAccess.types
@@ -21,8 +21,8 @@ class C {
         const ok: C["foo"] = 3;
 >ok : number
 >   : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         // not supported yet, could support in future:
         const badForNow: C[#bar] = 3;   // Error
diff --git a/tests/baselines/reference/privateNamesAndMethods(target=es2022).types b/tests/baselines/reference/privateNamesAndMethods(target=es2022).types
index d8a20d586b9..bfd645d10f9 100644
--- a/tests/baselines/reference/privateNamesAndMethods(target=es2022).types
+++ b/tests/baselines/reference/privateNamesAndMethods(target=es2022).types
@@ -65,8 +65,8 @@ class A {
 >          : ^ ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         this.#bar(30);
 >this.#bar(30) : Promise<void>
@@ -75,8 +75,8 @@ class A {
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         this.#baz(30);
 >this.#baz(30) : AsyncGenerator<never, number, unknown>
@@ -85,8 +85,8 @@ class A {
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         this.#quux = this.#quux + 1;
 >this.#quux = this.#quux + 1 : number
@@ -140,8 +140,8 @@ class B extends A {
 >          : ^ ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNamesAndMethods(target=esnext).types b/tests/baselines/reference/privateNamesAndMethods(target=esnext).types
index d8a20d586b9..bfd645d10f9 100644
--- a/tests/baselines/reference/privateNamesAndMethods(target=esnext).types
+++ b/tests/baselines/reference/privateNamesAndMethods(target=esnext).types
@@ -65,8 +65,8 @@ class A {
 >          : ^ ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         this.#bar(30);
 >this.#bar(30) : Promise<void>
@@ -75,8 +75,8 @@ class A {
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         this.#baz(30);
 >this.#baz(30) : AsyncGenerator<never, number, unknown>
@@ -85,8 +85,8 @@ class A {
 >          : ^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         this.#quux = this.#quux + 1;
 >this.#quux = this.#quux + 1 : number
@@ -140,8 +140,8 @@ class B extends A {
 >          : ^ ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNamesAndStaticFields.types b/tests/baselines/reference/privateNamesAndStaticFields.types
index ec637a89eb2..0659dfef689 100644
--- a/tests/baselines/reference/privateNamesAndStaticFields.types
+++ b/tests/baselines/reference/privateNamesAndStaticFields.types
@@ -15,14 +15,14 @@ class A {
 
     constructor () {
         A.#foo = 3;
->A.#foo = 3 : number
->           : ^^^^^^
+>A.#foo = 3 : 3
+>           : ^
 >A.#foo : number
 >       : ^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
         B.#foo; // Error
 >B.#foo : any
@@ -56,14 +56,14 @@ class B extends A {
 >      : ^^^^^^^^
 
         B.#foo = "some string";
->B.#foo = "some string" : string
->                       : ^^^^^^
+>B.#foo = "some string" : "some string"
+>                       : ^^^^^^^^^^^^^
 >B.#foo : string
 >       : ^^^^^^
 >B : typeof B
 >  : ^^^^^^^^
->"some string" : string
->              : ^^^^^^
+>"some string" : "some string"
+>              : ^^^^^^^^^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNamesAndStaticMethods(target=es2022).types b/tests/baselines/reference/privateNamesAndStaticMethods(target=es2022).types
index 2ac2331e50b..41902dd913f 100644
--- a/tests/baselines/reference/privateNamesAndStaticMethods(target=es2022).types
+++ b/tests/baselines/reference/privateNamesAndStaticMethods(target=es2022).types
@@ -65,8 +65,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -75,8 +75,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -85,8 +85,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#quux = A.#quux + 1;
 >A.#quux = A.#quux + 1 : number
@@ -140,8 +140,8 @@ class B extends A {
 >       : ^ ^^      ^^^^^^^^^
 >B : typeof B
 >  : ^^^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNamesAndStaticMethods(target=esnext).types b/tests/baselines/reference/privateNamesAndStaticMethods(target=esnext).types
index 2ac2331e50b..41902dd913f 100644
--- a/tests/baselines/reference/privateNamesAndStaticMethods(target=esnext).types
+++ b/tests/baselines/reference/privateNamesAndStaticMethods(target=esnext).types
@@ -65,8 +65,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -75,8 +75,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#bar(30);
 >A.#bar(30) : Promise<void>
@@ -85,8 +85,8 @@ class A {
 >       : ^ ^^      ^^^^^^^^^^^^^^^^^^
 >A : typeof A
 >  : ^^^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
         A.#quux = A.#quux + 1;
 >A.#quux = A.#quux + 1 : number
@@ -140,8 +140,8 @@ class B extends A {
 >       : ^ ^^      ^^^^^^^^^
 >B : typeof B
 >  : ^^^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/privateNamesAndkeyof.types b/tests/baselines/reference/privateNamesAndkeyof.types
index 7591a25179a..5622fc7df30 100644
--- a/tests/baselines/reference/privateNamesAndkeyof.types
+++ b/tests/baselines/reference/privateNamesAndkeyof.types
@@ -18,8 +18,8 @@ class A {
     get #fooProp() { return 1; };
 >#fooProp : number
 >         : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     set #fooProp(value: number) { };
 >#fooProp : number
diff --git a/tests/baselines/reference/privateNamesIncompatibleModifiers.types b/tests/baselines/reference/privateNamesIncompatibleModifiers.types
index 5c4586ea18b..f0998a441f3 100644
--- a/tests/baselines/reference/privateNamesIncompatibleModifiers.types
+++ b/tests/baselines/reference/privateNamesIncompatibleModifiers.types
@@ -82,8 +82,8 @@ class A {
     public get #fooProp() { return  3; }         // Error
 >#fooProp : number
 >         : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     public set #fooProp(value: number) {  }      // Error
 >#fooProp : number
@@ -94,8 +94,8 @@ class A {
     private get #barProp() { return  3; }        // Error
 >#barProp : number
 >         : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     private set #barProp(value: number) {  }     // Error
 >#barProp : number
@@ -106,8 +106,8 @@ class A {
     protected get #bazProp() { return  3; }      // Error
 >#bazProp : number
 >         : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     protected set #bazProp(value: number) {  }   // Error
 >#bazProp : number
@@ -118,8 +118,8 @@ class A {
     readonly get #quxProp() { return  3; }       // Error
 >#quxProp : number
 >         : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
     readonly set #quxProp(value: number) {  }    // Error
 >#quxProp : number
@@ -140,8 +140,8 @@ class A {
     async get #asyncProp() { return 1; }         // Error
 >#asyncProp : number
 >           : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     async set #asyncProp(value: number) { }      // Error
 >#asyncProp : number
diff --git a/tests/baselines/reference/privateWriteOnlyAccessorRead.types b/tests/baselines/reference/privateWriteOnlyAccessorRead.types
index 80f6b7114b1..342f889fdcb 100644
--- a/tests/baselines/reference/privateWriteOnlyAccessorRead.types
+++ b/tests/baselines/reference/privateWriteOnlyAccessorRead.types
@@ -216,12 +216,12 @@ class Test {
 >     : ^^^^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     let arr = [
 >arr : number[]
diff --git a/tests/baselines/reference/promiseChaining.types b/tests/baselines/reference/promiseChaining.types
index 977c6d442b8..3f7c0148c4e 100644
--- a/tests/baselines/reference/promiseChaining.types
+++ b/tests/baselines/reference/promiseChaining.types
@@ -63,8 +63,8 @@ class Chain<T> {
 >           : ^ ^^^^^^^^^^^^^^
 >x : S
 >  : ^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 >then : <S>(cb: (x: string) => S) => Chain<S>
 >     : ^ ^^  ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x => x.length : (x: string) => number
diff --git a/tests/baselines/reference/promiseType.types b/tests/baselines/reference/promiseType.types
index fdd8c04d549..1a975630f0f 100644
--- a/tests/baselines/reference/promiseType.types
+++ b/tests/baselines/reference/promiseType.types
@@ -433,8 +433,8 @@ const p19 = p.catch(() => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p20 = p.then(undefined);
 >p20 : Promise<boolean>
@@ -574,8 +574,8 @@ const p28 = p.then(() => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p29 = p.then(() => Promise.reject(1));
 >p29 : Promise<never>
@@ -757,8 +757,8 @@ const p38 = p.then(undefined, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p39 = p.then(undefined, () => Promise.reject(1));
 >p39 : Promise<boolean>
@@ -924,8 +924,8 @@ const p48 = p.then(null, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p49 = p.then(null, () => Promise.reject(1));
 >p49 : Promise<boolean>
@@ -1125,8 +1125,8 @@ const p58 = p.then(() => "1", () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p59 = p.then(() => "1", () => Promise.reject(1));
 >p59 : Promise<string>
@@ -1321,8 +1321,8 @@ const p68 = p.then(() => x, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p69 = p.then(() => x, () => Promise.reject(1));
 >p69 : Promise<any>
@@ -1525,8 +1525,8 @@ const p78 = p.then(() => undefined, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p79 = p.then(() => undefined, () => Promise.reject(1));
 >p79 : Promise<any>
@@ -1712,8 +1712,8 @@ const p88 = p.then(() => null, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p89 = p.then(() => null, () => Promise.reject(1));
 >p89 : Promise<any>
@@ -1897,8 +1897,8 @@ const p98 = p.then(() => {}, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p99 = p.then(() => {}, () => Promise.reject(1));
 >p99 : Promise<void>
@@ -2100,8 +2100,8 @@ const pa8 = p.then(() => {throw 1}, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
 >pa9 : Promise<never>
@@ -2152,8 +2152,8 @@ const pb0 = p.then(() => Promise.resolve("1"), undefined);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -2178,8 +2178,8 @@ const pb1 = p.then(() => Promise.resolve("1"), null);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
 const pb2 = p.then(() => Promise.resolve("1"), () => 1);
 >pb2 : Promise<string | number>
@@ -2202,8 +2202,8 @@ const pb2 = p.then(() => Promise.resolve("1"), () => 1);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
 >1 : 1
@@ -2230,8 +2230,8 @@ const pb3 = p.then(() => Promise.resolve("1"), () => x);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
@@ -2257,8 +2257,8 @@ const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => undefined : () => any
 >                : ^^^^^^^^^
 >undefined : undefined
@@ -2285,8 +2285,8 @@ const pb5 = p.then(() => Promise.resolve("1"), () => null);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -2311,8 +2311,8 @@ const pb6 = p.then(() => Promise.resolve("1"), () => {});
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => {} : () => void
 >         : ^^^^^^^^^^
 
@@ -2337,8 +2337,8 @@ const pb7 = p.then(() => Promise.resolve("1"), () => {throw 1});
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => {throw 1} : () => never
 >                : ^^^^^^^^^^^
 >1 : 1
@@ -2365,8 +2365,8 @@ const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => Promise.resolve(1) : () => Promise<number>
 >                         : ^^^^^^^^^^^^^^^^^^^^^
 >Promise.resolve(1) : Promise<number>
@@ -2377,8 +2377,8 @@ const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >pb9 : Promise<string>
@@ -2401,8 +2401,8 @@ const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => Promise.reject(1) : () => Promise<never>
 >                        : ^^^^^^^^^^^^^^^^^^^^
 >Promise.reject(1) : Promise<never>
@@ -2662,8 +2662,8 @@ const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >pc9 : Promise<never>
diff --git a/tests/baselines/reference/promiseTypeInference.types b/tests/baselines/reference/promiseTypeInference.types
index c2627183ff6..5b06d5560f2 100644
--- a/tests/baselines/reference/promiseTypeInference.types
+++ b/tests/baselines/reference/promiseTypeInference.types
@@ -45,8 +45,8 @@ var $$x = load("something").then(s => convert(s));
 >                  : ^^^^^^^^^^^^^^^^
 >load : (name: string) => CPromise<string>
 >     : ^    ^^      ^^^^^                
->"something" : string
->            : ^^^^^^
+>"something" : "something"
+>            : ^^^^^^^^^^^
 >then : <U>(success?: (value: string) => CPromise<U>) => CPromise<U>
 >     : ^ ^^       ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >s => convert(s) : (s: string) => IPromise<number>
diff --git a/tests/baselines/reference/promiseTypeInferenceUnion.types b/tests/baselines/reference/promiseTypeInferenceUnion.types
index 660574a577c..e5277861461 100644
--- a/tests/baselines/reference/promiseTypeInferenceUnion.types
+++ b/tests/baselines/reference/promiseTypeInferenceUnion.types
@@ -73,8 +73,8 @@ const g1: Promise<number> = Promise.resolve(f1(42));
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >f1 : (x: number) => number | Promise<number>
 >   : ^ ^^      ^^^^^                        
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 const g2: Promise<number> = Promise.resolve(f2(42));
 >g2 : Promise<number>
@@ -91,8 +91,8 @@ const g2: Promise<number> = Promise.resolve(f2(42));
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f2 : (x: number) => number | PromiseLike<number>
 >   : ^ ^^      ^^^^^                            
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 const g3: Promise<number> = Promise.resolve(f3(42));
 >g3 : Promise<number>
@@ -109,6 +109,6 @@ const g3: Promise<number> = Promise.resolve(f3(42));
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f3 : (x: number) => number | Promise<number> | PromiseLike<number>
 >   : ^ ^^      ^^^^^                                              
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/promiseTypeStrictNull.types b/tests/baselines/reference/promiseTypeStrictNull.types
index d8084e8c375..7ff8d96c59f 100644
--- a/tests/baselines/reference/promiseTypeStrictNull.types
+++ b/tests/baselines/reference/promiseTypeStrictNull.types
@@ -433,8 +433,8 @@ const p19 = p.catch(() => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p20 = p.then(undefined);
 >p20 : Promise<boolean>
@@ -574,8 +574,8 @@ const p28 = p.then(() => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p29 = p.then(() => Promise.reject(1));
 >p29 : Promise<never>
@@ -757,8 +757,8 @@ const p38 = p.then(undefined, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p39 = p.then(undefined, () => Promise.reject(1));
 >p39 : Promise<boolean>
@@ -924,8 +924,8 @@ const p48 = p.then(null, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p49 = p.then(null, () => Promise.reject(1));
 >p49 : Promise<boolean>
@@ -1125,8 +1125,8 @@ const p58 = p.then(() => "1", () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p59 = p.then(() => "1", () => Promise.reject(1));
 >p59 : Promise<string>
@@ -1321,8 +1321,8 @@ const p68 = p.then(() => x, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p69 = p.then(() => x, () => Promise.reject(1));
 >p69 : Promise<any>
@@ -1525,8 +1525,8 @@ const p78 = p.then(() => undefined, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p79 = p.then(() => undefined, () => Promise.reject(1));
 >p79 : Promise<undefined>
@@ -1712,8 +1712,8 @@ const p88 = p.then(() => null, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p89 = p.then(() => null, () => Promise.reject(1));
 >p89 : Promise<null>
@@ -1897,8 +1897,8 @@ const p98 = p.then(() => {}, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const p99 = p.then(() => {}, () => Promise.reject(1));
 >p99 : Promise<void>
@@ -2100,8 +2100,8 @@ const pa8 = p.then(() => {throw 1}, () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
 >pa9 : Promise<never>
@@ -2152,8 +2152,8 @@ const pb0 = p.then(() => Promise.resolve("1"), undefined);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -2178,8 +2178,8 @@ const pb1 = p.then(() => Promise.resolve("1"), null);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
 const pb2 = p.then(() => Promise.resolve("1"), () => 1);
 >pb2 : Promise<string | number>
@@ -2202,8 +2202,8 @@ const pb2 = p.then(() => Promise.resolve("1"), () => 1);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
 >1 : 1
@@ -2230,8 +2230,8 @@ const pb3 = p.then(() => Promise.resolve("1"), () => x);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
@@ -2257,8 +2257,8 @@ const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => undefined : () => undefined
 >                : ^^^^^^^^^^^^^^^
 >undefined : undefined
@@ -2285,8 +2285,8 @@ const pb5 = p.then(() => Promise.resolve("1"), () => null);
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => null : () => null
 >           : ^^^^^^^^^^
 
@@ -2311,8 +2311,8 @@ const pb6 = p.then(() => Promise.resolve("1"), () => {});
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => {} : () => void
 >         : ^^^^^^^^^^
 
@@ -2337,8 +2337,8 @@ const pb7 = p.then(() => Promise.resolve("1"), () => {throw 1});
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => {throw 1} : () => never
 >                : ^^^^^^^^^^^
 >1 : 1
@@ -2365,8 +2365,8 @@ const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => Promise.resolve(1) : () => Promise<number>
 >                         : ^^^^^^^^^^^^^^^^^^^^^
 >Promise.resolve(1) : Promise<number>
@@ -2377,8 +2377,8 @@ const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >pb9 : Promise<string>
@@ -2401,8 +2401,8 @@ const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >() => Promise.reject(1) : () => Promise<never>
 >                        : ^^^^^^^^^^^^^^^^^^^^
 >Promise.reject(1) : Promise<never>
@@ -2662,8 +2662,8 @@ const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >pc9 : Promise<never>
diff --git a/tests/baselines/reference/promiseVoidErrorCallback.types b/tests/baselines/reference/promiseVoidErrorCallback.types
index ad6e5ae320f..1ab8bcbae74 100644
--- a/tests/baselines/reference/promiseVoidErrorCallback.types
+++ b/tests/baselines/reference/promiseVoidErrorCallback.types
@@ -36,8 +36,8 @@ function f1(): Promise<T1> {
 >                   : ^^^^^^^^^^^^^^^^^
 >__t1 : string
 >     : ^^^^^^
->"foo_t1" : string
->         : ^^^^^^
+>"foo_t1" : "foo_t1"
+>         : ^^^^^^^^
 }
 
 function f2(x: T1): T2 {
diff --git a/tests/baselines/reference/propagationOfPromiseInitialization.types b/tests/baselines/reference/propagationOfPromiseInitialization.types
index 1f260fb9e36..361d37b5b23 100644
--- a/tests/baselines/reference/propagationOfPromiseInitialization.types
+++ b/tests/baselines/reference/propagationOfPromiseInitialization.types
@@ -38,7 +38,7 @@ foo.then((x) => {
 
     // x is inferred to be a number
     return "asdf";
->"asdf" : string
+>"asdf" : "asdf"
 >       : ^^^^^^
 
 }).then((x) => {
@@ -59,8 +59,8 @@ foo.then((x) => {
 >       : ^^^^^^
 
     return 123;
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
 });
 
diff --git a/tests/baselines/reference/properties.types b/tests/baselines/reference/properties.types
index d1d5cee3727..bf71a4e5e81 100644
--- a/tests/baselines/reference/properties.types
+++ b/tests/baselines/reference/properties.types
@@ -10,8 +10,8 @@ class MyClass
 >      : ^^^^^^
     {
         return 42;
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 
     public set Count(value: number)
diff --git a/tests/baselines/reference/propertiesAndIndexersForNumericNames.types b/tests/baselines/reference/propertiesAndIndexersForNumericNames.types
index a639a385bd5..eaa00d17688 100644
--- a/tests/baselines/reference/propertiesAndIndexersForNumericNames.types
+++ b/tests/baselines/reference/propertiesAndIndexersForNumericNames.types
@@ -14,106 +14,106 @@ class C {
     public "1": string = "number"; // Error
 >"1" : string
 >    : ^^^^^^
->"number" : string
->         : ^^^^^^
+>"number" : "number"
+>         : ^^^^^^^^
 
     public "-1": string = "negative number"; // Error
 >"-1" : string
 >     : ^^^^^^
->"negative number" : string
->                  : ^^^^^^
+>"negative number" : "negative number"
+>                  : ^^^^^^^^^^^^^^^^^
 
     public "-2.5": string = "negative number"; // Error
 >"-2.5" : string
 >       : ^^^^^^
->"negative number" : string
->                  : ^^^^^^
+>"negative number" : "negative number"
+>                  : ^^^^^^^^^^^^^^^^^
 
     public "3.141592": string = "pi-sitive number"; // Error
 >"3.141592" : string
 >           : ^^^^^^
->"pi-sitive number" : string
->                   : ^^^^^^
+>"pi-sitive number" : "pi-sitive number"
+>                   : ^^^^^^^^^^^^^^^^^^
 
     public "1.2e-20": string = "really small number"; // Error
 >"1.2e-20" : string
 >          : ^^^^^^
->"really small number" : string
->                      : ^^^^^^
+>"really small number" : "really small number"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
     public "Infinity": string = "A gillion"; // Error
 >"Infinity" : string
 >           : ^^^^^^
->"A gillion" : string
->            : ^^^^^^
+>"A gillion" : "A gillion"
+>            : ^^^^^^^^^^^
 
     public "-Infinity": string = "Negative-a-gillion"; // Error
 >"-Infinity" : string
 >            : ^^^^^^
->"Negative-a-gillion" : string
->                     : ^^^^^^
+>"Negative-a-gillion" : "Negative-a-gillion"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
     public "NaN": string = "not a number"; // Error
 >"NaN" : string
 >      : ^^^^^^
->"not a number" : string
->               : ^^^^^^
+>"not a number" : "not a number"
+>               : ^^^^^^^^^^^^^^
     
     // These all have *partially* numeric names,
     // but should really be treated as plain string literals.
     public " 1": string = "leading space"; // No error
 >" 1" : string
 >     : ^^^^^^
->"leading space" : string
->                : ^^^^^^
+>"leading space" : "leading space"
+>                : ^^^^^^^^^^^^^^^
 
     public "1    ": string = "trailing space"; // No error
 >"1    " : string
 >        : ^^^^^^
->"trailing space" : string
->                 : ^^^^^^
+>"trailing space" : "trailing space"
+>                 : ^^^^^^^^^^^^^^^^
 
     public "": string = "no nothing"; // No error
 >"" : string
 >   : ^^^^^^
->"no nothing" : string
->             : ^^^^^^
+>"no nothing" : "no nothing"
+>             : ^^^^^^^^^^^^
 
     public "    ": string = "just space"; // No error
 >"    " : string
 >       : ^^^^^^
->"just space" : string
->             : ^^^^^^
+>"just space" : "just space"
+>             : ^^^^^^^^^^^^
 
     public "1 0 1": string = "several numbers and spaces"; // No error
 >"1 0 1" : string
 >        : ^^^^^^
->"several numbers and spaces" : string
->                             : ^^^^^^
+>"several numbers and spaces" : "several numbers and spaces"
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     public "hunter2": string = "not a password"; // No error
 >"hunter2" : string
 >          : ^^^^^^
->"not a password" : string
->                 : ^^^^^^
+>"not a password" : "not a password"
+>                 : ^^^^^^^^^^^^^^^^
 
     public "+Infinity": string = "A gillion"; // No error
 >"+Infinity" : string
 >            : ^^^^^^
->"A gillion" : string
->            : ^^^^^^
+>"A gillion" : "A gillion"
+>            : ^^^^^^^^^^^
 
     public "+NaN": string = "not a positive number"; // No error
 >"+NaN" : string
 >       : ^^^^^^
->"not a positive number" : string
->                        : ^^^^^^
+>"not a positive number" : "not a positive number"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
     public "-NaN": string = "not a negative number"; // No error
 >"-NaN" : string
 >       : ^^^^^^
->"not a negative number" : string
->                        : ^^^^^^
+>"not a negative number" : "not a negative number"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
     
 
     // These fall into the above category, however, they are "trickier";
@@ -122,61 +122,61 @@ class C {
     public "+1": string = "positive number (for the paranoid)"; // No error
 >"+1" : string
 >     : ^^^^^^
->"positive number (for the paranoid)" : string
->                                     : ^^^^^^
+>"positive number (for the paranoid)" : "positive number (for the paranoid)"
+>                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     public "1e0": string = "just one"; // No error
 >"1e0" : string
 >      : ^^^^^^
->"just one" : string
->           : ^^^^^^
+>"just one" : "just one"
+>           : ^^^^^^^^^^
 
     public "-0": string = "just zero"; // No error
 >"-0" : string
 >     : ^^^^^^
->"just zero" : string
->            : ^^^^^^
+>"just zero" : "just zero"
+>            : ^^^^^^^^^^^
 
     public "-0e0": string = "just zero"; // No error
 >"-0e0" : string
 >       : ^^^^^^
->"just zero" : string
->            : ^^^^^^
+>"just zero" : "just zero"
+>            : ^^^^^^^^^^^
 
     public "0xF00D": string = "hex food"; // No error
 >"0xF00D" : string
 >         : ^^^^^^
->"hex food" : string
->           : ^^^^^^
+>"hex food" : "hex food"
+>           : ^^^^^^^^^^
 
     public "0xBEEF": string = "hex beef"; // No error
 >"0xBEEF" : string
 >         : ^^^^^^
->"hex beef" : string
->           : ^^^^^^
+>"hex beef" : "hex beef"
+>           : ^^^^^^^^^^
 
     public "0123": string = "oct 83"; // No error
 >"0123" : string
 >       : ^^^^^^
->"oct 83" : string
->         : ^^^^^^
+>"oct 83" : "oct 83"
+>         : ^^^^^^^^
 
     public "0o123": string = "explicit oct 83"; // No error
 >"0o123" : string
 >        : ^^^^^^
->"explicit oct 83" : string
->                  : ^^^^^^
+>"explicit oct 83" : "explicit oct 83"
+>                  : ^^^^^^^^^^^^^^^^^
 
     public "0b101101001010": string = "explicit binary"; // No error
 >"0b101101001010" : string
 >                 : ^^^^^^
->"explicit binary" : string
->                  : ^^^^^^
+>"explicit binary" : "explicit binary"
+>                  : ^^^^^^^^^^^^^^^^^
 
     public "0.000000000000000000012": string = "should've been in exponential form"; // No error
 >"0.000000000000000000012" : string
 >                          : ^^^^^^
->"should've been in exponential form" : string
->                                     : ^^^^^^
+>"should've been in exponential form" : "should've been in exponential form"
+>                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/propertiesOfGenericConstructorFunctions.types b/tests/baselines/reference/propertiesOfGenericConstructorFunctions.types
index dc8fb20370f..b52272a38b3 100644
--- a/tests/baselines/reference/propertiesOfGenericConstructorFunctions.types
+++ b/tests/baselines/reference/propertiesOfGenericConstructorFunctions.types
@@ -56,10 +56,10 @@ const map = new Multimap("a", 1);
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Multimap : typeof Multimap
 >         : ^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
->1 : number
->  : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>1 : 1
+>  : ^
 
 // without type annotation
 const map2 = new Multimap("m", 2);
@@ -69,10 +69,10 @@ const map2 = new Multimap("m", 2);
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^
 >Multimap : typeof Multimap
 >         : ^^^^^^^^^^^^^^^
->"m" : string
->    : ^^^^^^
->2 : number
->  : ^^^^^^
+>"m" : "m"
+>    : ^^^
+>2 : 2
+>  : ^
 
 /** @type {number} */
 var n = map._map['hi']
@@ -224,8 +224,8 @@ var cp = new Cp(1)
 >          : ^^^^^^^^^^
 >Cp : typeof Cp
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 /** @type {number} */
 var n = cp.x
diff --git a/tests/baselines/reference/propertyAccess.types b/tests/baselines/reference/propertyAccess.types
index 62a55ac4c4b..4d8b0835633 100644
--- a/tests/baselines/reference/propertyAccess.types
+++ b/tests/baselines/reference/propertyAccess.types
@@ -43,8 +43,8 @@ var numIndex: { [n: number]: string } = { 3: 'three', 'three': 'three' };
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >3 : string
 >  : ^^^^^^
->'three' : string
->        : ^^^^^^
+>'three' : "three"
+>        : ^^^^^^^
 >'three' : string
 >        : ^^^^^^
 >'three' : "three"
@@ -161,16 +161,16 @@ var someObject: { name: string };
 
 // Assign to a property access
 obj.y = 4;
->obj.y = 4 : number
->          : ^^^^^^
+>obj.y = 4 : 4
+>          : ^
 >obj.y : number
 >      : ^^^^^^
 >obj : { 10: string; x: string; y: number; z: { n: string; m: number; o: () => boolean; }; 'literal property': number; }
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 // Property access on value of type 'any'
 anyVar.x = anyVar.y = obj.x = anyVar.z;
diff --git a/tests/baselines/reference/propertyAccess1.types b/tests/baselines/reference/propertyAccess1.types
index dd98aae438e..28dae6b3507 100644
--- a/tests/baselines/reference/propertyAccess1.types
+++ b/tests/baselines/reference/propertyAccess1.types
@@ -8,16 +8,16 @@ var foo: { a: number; };
 >  : ^^^^^^
 
 foo.a = 4;
->foo.a = 4 : number
->          : ^^^^^^
+>foo.a = 4 : 4
+>          : ^
 >foo.a : number
 >      : ^^^^^^
 >foo : { a: number; }
 >    : ^^^^^      ^^^
 >a : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 foo.b = 5;
 >foo.b = 5 : 5
diff --git a/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types b/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types
index d863ef4886a..36a58f6d9f6 100644
--- a/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types
+++ b/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types
@@ -12,14 +12,14 @@ declare var a: Test;
 >  : ^^^^
 
 a.foo = 'baz';
->a.foo = 'baz' : string
->              : ^^^^^^
+>a.foo = 'baz' : "baz"
+>              : ^^^^^
 >a.foo : string
 >      : ^^^^^^
 >a : Test
 >  : ^^^^
 >foo : string
 >    : ^^^^^^
->'baz' : string
->      : ^^^^^^
+>'baz' : "baz"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
index 8316d0e6317..c9b7d6d749b 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
@@ -10,8 +10,8 @@ class A {
     foo(): string { return ''; }
 >foo : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class B extends A {
@@ -25,8 +25,8 @@ class B extends A {
 >    : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types
index d6ed40919a5..13236da3580 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types
@@ -10,8 +10,8 @@ class A {
     foo(): string { return ''; }
 >foo : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class B extends A {
@@ -25,8 +25,8 @@ class B extends A {
 >    : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
index 34e6f3292f2..57655018bed 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
@@ -8,8 +8,8 @@ class A {
     foo(): string { return ''; }
 >foo : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class B extends A {
@@ -23,8 +23,8 @@ class B extends A {
 >    : ^^^^^^      
 
         return '';
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
index 91f0db131e3..df7f91479eb 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
@@ -185,6 +185,6 @@ var r4 = b.foo(1);
 >  : ^^^^^^^^ ^^ ^^ ^^^^^^^^^^^^^^
 >foo : <T>(x: T) => string
 >    : ^ ^^ ^^ ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/propertyAccessWidening.types b/tests/baselines/reference/propertyAccessWidening.types
index 02fc7f0600d..9ad11c7d6dc 100644
--- a/tests/baselines/reference/propertyAccessWidening.types
+++ b/tests/baselines/reference/propertyAccessWidening.types
@@ -134,8 +134,8 @@ function foo(options?: { a: string, b: number }) {
 >    : ^^^
 
     (options || {}).a = 1;          // Object type widened, error
->(options || {}).a = 1 : number
->                      : ^^^^^^
+>(options || {}).a = 1 : 1
+>                      : ^
 >(options || {}).a : any
 >                  : ^^^
 >(options || {}) : { a: string; b: number; } | {}
@@ -148,12 +148,12 @@ function foo(options?: { a: string, b: number }) {
 >   : ^^
 >a : any
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     (options || {})["a"] = 1;       // Object type widened, error
->(options || {})["a"] = 1 : number
->                         : ^^^^^^
+>(options || {})["a"] = 1 : 1
+>                         : ^
 >(options || {})["a"] : any
 >                     : ^^^
 >(options || {}) : { a: string; b: number; } | {}
@@ -166,7 +166,7 @@ function foo(options?: { a: string, b: number }) {
 >   : ^^
 >"a" : "a"
 >    : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType3.types b/tests/baselines/reference/propertyAssignmentUseParentType3.types
index c1235b27d2b..f2f2393116e 100644
--- a/tests/baselines/reference/propertyAssignmentUseParentType3.types
+++ b/tests/baselines/reference/propertyAssignmentUseParentType3.types
@@ -8,8 +8,8 @@ function foo1(): number {
 >     : ^^^^^^^^^^^
 
     return 123;
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 }
 foo1.toFixed = "";
 >foo1.toFixed = "" : ""
@@ -48,8 +48,8 @@ function foo3(): string {
 >     : ^^^^^^^^^^^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 foo3.trim = "";
 >foo3.trim = "" : ""
@@ -74,8 +74,8 @@ function foo4(): ({x: number}) {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 }
 foo4.x = "456";
 >foo4.x = "456" : "456"
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.types b/tests/baselines/reference/protectedInstanceMemberAccessibility.types
index 3b715f1bfcb..90b3aae30ef 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.types
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.types
@@ -14,8 +14,8 @@ class A {
 >  : ^^^^^^      
 
         return "hello";
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/publicGetterProtectedSetterFromThisParameter.types b/tests/baselines/reference/publicGetterProtectedSetterFromThisParameter.types
index ad517e6e726..711c8c86018 100644
--- a/tests/baselines/reference/publicGetterProtectedSetterFromThisParameter.types
+++ b/tests/baselines/reference/publicGetterProtectedSetterFromThisParameter.types
@@ -8,8 +8,8 @@ class A {
   get x() { return 0; }
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   protected set x(v: number) { }
 >x : number
@@ -20,8 +20,8 @@ class A {
   public get y() { return 0; }
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   protected set y(v: number) { }
 >y : number
@@ -37,8 +37,8 @@ class B {
   get q() { return 0; }
 >q : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   protected set q(v: number) { }
 >q : number
@@ -49,8 +49,8 @@ class B {
   protected get u() { return 0; }
 >u : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   protected set u(v: number) { }
 >u : number
@@ -70,76 +70,76 @@ class B {
 
     // Should have no errors in this block
     this.x = 0;
->this.x = 0 : number
->           : ^^^^^^
+>this.x = 0 : 0
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : A
 >     : ^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     this.y = 0;
->this.y = 0 : number
->           : ^^^^^^
+>this.y = 0 : 0
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : A
 >     : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     a.x = 0;
->a.x = 0 : number
->        : ^^^^^^
+>a.x = 0 : 0
+>        : ^
 >a.x : number
 >    : ^^^^^^
 >a : A
 >  : ^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     a.y = 0;
->a.y = 0 : number
->        : ^^^^^^
+>a.y = 0 : 0
+>        : ^
 >a.y : number
 >    : ^^^^^^
 >a : A
 >  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b.q = 0;
->b.q = 0 : number
->        : ^^^^^^
+>b.q = 0 : 0
+>        : ^
 >b.q : number
 >    : ^^^^^^
 >b : B
 >  : ^
 >q : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b.u = 0;
->b.u = 0 : number
->        : ^^^^^^
+>b.u = 0 : 0
+>        : ^
 >b.u : number
 >    : ^^^^^^
 >b : B
 >  : ^
 >u : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
   }
 }
 
@@ -154,76 +154,76 @@ function bar(this: A, a: A, b: B) {
 >  : ^
 
     this.x = 0;
->this.x = 0 : number
->           : ^^^^^^
+>this.x = 0 : 0
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : A
 >     : ^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     this.y = 0;
->this.y = 0 : number
->           : ^^^^^^
+>this.y = 0 : 0
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : A
 >     : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     a.x = 0;
->a.x = 0 : number
->        : ^^^^^^
+>a.x = 0 : 0
+>        : ^
 >a.x : number
 >    : ^^^^^^
 >a : A
 >  : ^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     a.y = 0;
->a.y = 0 : number
->        : ^^^^^^
+>a.y = 0 : 0
+>        : ^
 >a.y : number
 >    : ^^^^^^
 >a : A
 >  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     // These should error
     b.q = 0;
->b.q = 0 : number
->        : ^^^^^^
+>b.q = 0 : 0
+>        : ^
 >b.q : number
 >    : ^^^^^^
 >b : B
 >  : ^
 >q : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b.u = 0;
->b.u = 0 : number
->        : ^^^^^^
+>b.u = 0 : 0
+>        : ^
 >b.u : number
 >    : ^^^^^^
 >b : B
 >  : ^
 >u : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/quickInfoSatisfiesTag.baseline b/tests/baselines/reference/quickInfoSatisfiesTag.baseline
index 5288c634ff5..62247027be5 100644
--- a/tests/baselines/reference/quickInfoSatisfiesTag.baseline
+++ b/tests/baselines/reference/quickInfoSatisfiesTag.baseline
@@ -4,7 +4,7 @@
 // const a = 1;
 //       ^
 // | ----------------------------------------------------------------------
-// | const a: number
+// | const a: 1
 // | @satisfies {number} comment
 // | ----------------------------------------------------------------------
 
@@ -44,8 +44,8 @@
           "kind": "space"
         },
         {
-          "text": "number",
-          "kind": "keyword"
+          "text": "1",
+          "kind": "stringLiteral"
         }
       ],
       "documentation": [],
diff --git a/tests/baselines/reference/reachabilityCheckWithEmptyDefault.types b/tests/baselines/reference/reachabilityCheckWithEmptyDefault.types
index c460cbc03f3..42f125d119c 100644
--- a/tests/baselines/reference/reachabilityCheckWithEmptyDefault.types
+++ b/tests/baselines/reference/reachabilityCheckWithEmptyDefault.types
@@ -26,6 +26,6 @@ function foo(x: any) {
 >           : ^^^^
 >print : { (): void; (s: string): void; }
 >      : ^^^^^^    ^^^ ^^      ^^^    ^^^
->'1' : string
->    : ^^^^^^
+>'1' : "1"
+>    : ^^^
 }
diff --git a/tests/baselines/reference/reachabilityChecks1.types b/tests/baselines/reference/reachabilityChecks1.types
index 67ada15062f..ae9446f9dbb 100644
--- a/tests/baselines/reference/reachabilityChecks1.types
+++ b/tests/baselines/reference/reachabilityChecks1.types
@@ -105,8 +105,8 @@ function f1(x) {
 >                 : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"123" : string
->      : ^^^^^^
+>"123" : "123"
+>      : ^^^^^
     }
     var x;
 >x : any
diff --git a/tests/baselines/reference/reachabilityChecks5.types b/tests/baselines/reference/reachabilityChecks5.types
index b1d409f0547..0fc1d9ce959 100644
--- a/tests/baselines/reference/reachabilityChecks5.types
+++ b/tests/baselines/reference/reachabilityChecks5.types
@@ -23,8 +23,8 @@ function f1(x): number {
 >  : ^^^
 
         return 1
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -45,8 +45,8 @@ function f2(x): number {
 >      : ^^^^^^^^^^^^^^^^
     }
     return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 function f3(x): number {
@@ -96,8 +96,8 @@ function f4(x): number {
 >  : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
     }
     catch (e) {
@@ -118,8 +118,8 @@ function f5(x): number {
 >  : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
     }
     catch (e) {
@@ -127,8 +127,8 @@ function f5(x): number {
 >  : ^^^
 
         return 2;
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
@@ -144,8 +144,8 @@ function f6(x): number {
 >  : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
         else 
         {
@@ -174,8 +174,8 @@ function f7(x): number {
 >  : ^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
         else {
             throw new Error();
@@ -190,8 +190,8 @@ function f7(x): number {
 >  : ^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -214,8 +214,8 @@ function f8(x): number {
         }
         else {
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
     }
     catch (e) {
@@ -223,8 +223,8 @@ function f8(x): number {
 >  : ^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -240,8 +240,8 @@ function f9(x): number {
 >      : ^^^^^
 
             return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
         }
     }
     catch (e) {
@@ -249,8 +249,8 @@ function f9(x): number {
 >  : ^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -277,8 +277,8 @@ function f10(x): number {
 >  : ^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -318,7 +318,7 @@ function f11(x): number {
 >  : ^^^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/reachabilityChecks7.types b/tests/baselines/reference/reachabilityChecks7.types
index 410265a7bf2..d2ebc749f20 100644
--- a/tests/baselines/reference/reachabilityChecks7.types
+++ b/tests/baselines/reference/reachabilityChecks7.types
@@ -75,6 +75,6 @@ let x1 = () => { use("Test"); }
 >            : ^^^^
 >use : (s: string) => void
 >    : ^ ^^      ^^^^^    
->"Test" : string
+>"Test" : "Test"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.types b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.types
index 9dd09ec40cc..12ab24b57a6 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.types
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.types
@@ -263,8 +263,8 @@ class FieldFeedback2<P extends MyPropsProps = MyPropsProps> extends FieldFeedbac
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >when : P["when"]
 >     : ^^^^^^^^^
->"now" : string
->      : ^^^^^^
+>"now" : "now"
+>      : ^^^^^
 
     return <div>Hello</div>;
 ><div>Hello</div> : JSX.Element
diff --git a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.types b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.types
index 9dfff34fc29..314979508e2 100644
--- a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.types
+++ b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.types
@@ -67,8 +67,8 @@ const Form = styled('div')({ color: "red" })
 >              : ^ ^^      ^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^             
 >styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/create-emotion-styled/index").StyledOtherComponentList["div"], any>
 >       : ^   ^^      ^^^^^                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^             
->'div' : string
->      : ^^^^^^
+>'div' : "div"
+>      : ^^^^^
 >{ color: "red" } : { color: string; }
 >                 : ^^^^^^^^^^^^^^^^^^
 >color : string
diff --git a/tests/baselines/reference/readonlyArraysAndTuples.types b/tests/baselines/reference/readonlyArraysAndTuples.types
index 89fdae8183d..93afca62879 100644
--- a/tests/baselines/reference/readonlyArraysAndTuples.types
+++ b/tests/baselines/reference/readonlyArraysAndTuples.types
@@ -179,16 +179,16 @@ v[1] = 1;        // Error
 >  : ^
 
 v[2] = 1;        // Error
->v[2] = 1 : number
->         : ^^^^^^
+>v[2] = 1 : 1
+>         : ^
 >v[2] : number
 >     : ^^^^^^
 >v : readonly [number, number, ...number[]]
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >2 : 2
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 delete v[2];     // Error
 >delete v[2] : boolean
@@ -201,8 +201,8 @@ delete v[2];     // Error
 >  : ^
 
 v[0 + 1] = 1;    // Error
->v[0 + 1] = 1 : number
->             : ^^^^^^
+>v[0 + 1] = 1 : 1
+>             : ^
 >v[0 + 1] : number
 >         : ^^^^^^
 >v : readonly [number, number, ...number[]]
@@ -213,12 +213,12 @@ v[0 + 1] = 1;    // Error
 >  : ^
 >1 : 1
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 v[0 + 2] = 1;    // Error
->v[0 + 2] = 1 : number
->             : ^^^^^^
+>v[0 + 2] = 1 : 1
+>             : ^
 >v[0 + 2] : number
 >         : ^^^^^^
 >v : readonly [number, number, ...number[]]
@@ -229,8 +229,8 @@ v[0 + 2] = 1;    // Error
 >  : ^
 >2 : 2
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 delete v[0 + 1]; // Error
 >delete v[0 + 1] : boolean
diff --git a/tests/baselines/reference/readonlyArraysAndTuples2.types b/tests/baselines/reference/readonlyArraysAndTuples2.types
index 38d689ee938..4f5b492bc8d 100644
--- a/tests/baselines/reference/readonlyArraysAndTuples2.types
+++ b/tests/baselines/reference/readonlyArraysAndTuples2.types
@@ -61,9 +61,9 @@ class A {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >['foo', 42] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->'foo' : string
->      : ^^^^^^
->42 : number
->   : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
+>42 : 42
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/readonlyConstructorAssignment.types b/tests/baselines/reference/readonlyConstructorAssignment.types
index 1a8b4b49413..5e6120ad28a 100644
--- a/tests/baselines/reference/readonlyConstructorAssignment.types
+++ b/tests/baselines/reference/readonlyConstructorAssignment.types
@@ -12,16 +12,16 @@ class A {
 >  : ^^^^^^
 
         this.x = 0;
->this.x = 0 : number
->           : ^^^^^^
+>this.x = 0 : 0
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
@@ -79,16 +79,16 @@ class C extends A {
 >  : ^^^^^^
 
         this.x = 1;
->this.x = 1 : number
->           : ^^^^^^
+>this.x = 1 : 1
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -101,16 +101,16 @@ class D {
 >  : ^^^^^^
 
         this.x = 0;
->this.x = 0 : number
->           : ^^^^^^
+>this.x = 0 : 0
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
@@ -134,16 +134,16 @@ class E extends D {
 >  : ^^^^^^
 
         this.x = 1;
->this.x = 1 : number
->           : ^^^^^^
+>this.x = 1 : 1
+>           : ^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/readonlyInConstructorParameters.types b/tests/baselines/reference/readonlyInConstructorParameters.types
index 4ce065865eb..e5f6e257631 100644
--- a/tests/baselines/reference/readonlyInConstructorParameters.types
+++ b/tests/baselines/reference/readonlyInConstructorParameters.types
@@ -18,8 +18,8 @@ new C(1).x = 2;
 >         : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >x : any
 >  : ^^^
 >2 : 2
@@ -49,8 +49,8 @@ new F(1).x;
 >         : ^
 >F : typeof F
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >x : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/readonlyMembers.types b/tests/baselines/reference/readonlyMembers.types
index a4a69d8b65a..0566106bdf4 100644
--- a/tests/baselines/reference/readonlyMembers.types
+++ b/tests/baselines/reference/readonlyMembers.types
@@ -17,8 +17,8 @@ var x: X = { a: 0 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 x.a = 1;  // Error
 >x.a = 1 : 1
@@ -66,16 +66,16 @@ class C {
 
     constructor() {
         this.a = 1;  // Ok
->this.a = 1 : number
->           : ^^^^^^
+>this.a = 1 : 1
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.b = 1;  // Ok
 >this.b = 1 : 1
@@ -108,16 +108,16 @@ class C {
 >                                                                                                                    : ^^^^^^^^^^
 
             this.a = 1;  // Error
->this.a = 1 : number
->           : ^^^^^^
+>this.a = 1 : 1
+>           : ^
 >this.a : any
 >       : ^^^
 >this : this
 >     : ^^^^
 >a : any
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             this.b = 1;  // Error
 >this.b = 1 : 1
@@ -149,16 +149,16 @@ class C {
 >    : ^^^^^^^^^^
 
         this.a = 1;  // Error
->this.a = 1 : number
->           : ^^^^^^
+>this.a = 1 : 1
+>           : ^
 >this.a : any
 >       : ^^^
 >this : this
 >     : ^^^^
 >a : any
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this.b = 1;  // Error
 >this.b = 1 : 1
@@ -224,16 +224,16 @@ o.a = 1;  // Error
 >  : ^
 
 o.b = 1;
->o.b = 1 : number
->        : ^^^^^^
+>o.b = 1 : 1
+>        : ^
 >o.b : number
 >    : ^^^^^^
 >o : { readonly a: number; b: number; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var p: { readonly a: number, b: number } = { a: 1, b: 1 };
 >p : { readonly a: number; b: number; }
@@ -246,12 +246,12 @@ var p: { readonly a: number, b: number } = { a: 1, b: 1 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 p.a = 1;  // Error
 >p.a = 1 : 1
@@ -266,16 +266,16 @@ p.a = 1;  // Error
 >  : ^
 
 p.b = 1;
->p.b = 1 : number
->        : ^^^^^^
+>p.b = 1 : 1
+>        : ^
 >p.b : number
 >    : ^^^^^^
 >p : { readonly a: number; b: number; }
 >  : ^^^^^^^^^^^^^^      ^^^^^      ^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var q: { a: number, b: number } = p;
 >q : { a: number; b: number; }
@@ -288,28 +288,28 @@ var q: { a: number, b: number } = p;
 >  : ^^^^^^^^^^^^^^      ^^^^^      ^^^
 
 q.a = 1;
->q.a = 1 : number
->        : ^^^^^^
+>q.a = 1 : 1
+>        : ^
 >q.a : number
 >    : ^^^^^^
 >q : { a: number; b: number; }
 >  : ^^^^^      ^^^^^      ^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 q.b = 1;
->q.b = 1 : number
->        : ^^^^^^
+>q.b = 1 : 1
+>        : ^
 >q.b : number
 >    : ^^^^^^
 >q : { a: number; b: number; }
 >  : ^^^^^      ^^^^^      ^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 enum E {
 >E : E
@@ -370,28 +370,28 @@ N.a = 1;  // Error
 >  : ^
 
 N.b = 1;
->N.b = 1 : number
->        : ^^^^^^
+>N.b = 1 : 1
+>        : ^
 >N.b : number
 >    : ^^^^^^
 >N : typeof N
 >  : ^^^^^^^^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 N.c = 1;
->N.c = 1 : number
->        : ^^^^^^
+>N.c = 1 : 1
+>        : ^
 >N.c : number
 >    : ^^^^^^
 >N : typeof N
 >  : ^^^^^^^^
 >c : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 let xx: { readonly [x: string]: string };
 >xx : { readonly [x: string]: string; }
@@ -410,16 +410,16 @@ let s = xx["foo"];
 >      : ^^^^^
 
 xx["foo"] = "abc";  // Error
->xx["foo"] = "abc" : string
->                  : ^^^^^^
+>xx["foo"] = "abc" : "abc"
+>                  : ^^^^^
 >xx["foo"] : string
 >          : ^^^^^^
 >xx : { readonly [x: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"foo" : "foo"
 >      : ^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 let yy: { readonly [x: number]: string, [x: string]: string };
 >yy : { readonly [x: number]: string; [x: string]: string; }
@@ -430,26 +430,26 @@ let yy: { readonly [x: number]: string, [x: string]: string };
 >  : ^^^^^^
 
 yy[1] = "abc";  // Error
->yy[1] = "abc" : string
->              : ^^^^^^
+>yy[1] = "abc" : "abc"
+>              : ^^^^^
 >yy[1] : string
 >      : ^^^^^^
 >yy : { readonly [x: number]: string; [x: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >1 : 1
 >  : ^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 yy["foo"] = "abc";
->yy["foo"] = "abc" : string
->                  : ^^^^^^
+>yy["foo"] = "abc" : "abc"
+>                  : ^^^^^
 >yy["foo"] : string
 >          : ^^^^^^
 >yy : { readonly [x: number]: string; [x: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"foo" : "foo"
 >      : ^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/readonlyPropertySubtypeRelationDirected.types b/tests/baselines/reference/readonlyPropertySubtypeRelationDirected.types
index 3e8bab08603..351ec983ffc 100644
--- a/tests/baselines/reference/readonlyPropertySubtypeRelationDirected.types
+++ b/tests/baselines/reference/readonlyPropertySubtypeRelationDirected.types
@@ -12,8 +12,8 @@ const two: { a: string } = { a: 'two' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 
 const one: { readonly a: string } = { a: 'one' };
 >one : { readonly a: string; }
@@ -24,8 +24,8 @@ const one: { readonly a: string } = { a: 'one' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'one' : string
->      : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
 
 function doSomething(condition: boolean) {
 >doSomething : (condition: boolean) => { readonly a: string; }
@@ -91,8 +91,8 @@ const two: { a: string } = { a: 'two' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 
 const one: { readonly a: string } = { a: 'one' };
 >one : { readonly a: string; }
@@ -103,8 +103,8 @@ const one: { readonly a: string } = { a: 'one' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'one' : string
->      : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
 
 function doSomething(condition: boolean) {
 >doSomething : (condition: boolean) => { readonly a: string; }
@@ -171,8 +171,8 @@ const one: { readonly a: string } = { a: 'one' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'one' : string
->      : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
 
 const two: { a: string } = { a: 'two' };
 >two : { a: string; }
@@ -183,8 +183,8 @@ const two: { a: string } = { a: 'two' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 
 function doSomething(condition: boolean) {
 >doSomething : (condition: boolean) => { readonly a: string; }
@@ -251,8 +251,8 @@ const one: { readonly a: string } = { a: 'one' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'one' : string
->      : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
 
 const two: { a: string } = { a: 'two' };
 >two : { a: string; }
@@ -263,8 +263,8 @@ const two: { a: string } = { a: 'two' };
 >             : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'two' : string
->      : ^^^^^^
+>'two' : "two"
+>      : ^^^^^
 
 function doSomething(condition: boolean) {
 >doSomething : (condition: boolean) => { readonly a: string; }
diff --git a/tests/baselines/reference/readonlyRestParameters.types b/tests/baselines/reference/readonlyRestParameters.types
index 554d2083732..d52d1631ac8 100644
--- a/tests/baselines/reference/readonlyRestParameters.types
+++ b/tests/baselines/reference/readonlyRestParameters.types
@@ -61,18 +61,18 @@ function f1(...args: readonly string[]) {
 >                 : ^^^^
 >f1 : (...args: readonly string[]) => void
 >   : ^^^^    ^^                 ^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
     f1('abc', ...args);
 >f1('abc', ...args) : void
 >                   : ^^^^
 >f1 : (...args: readonly string[]) => void
 >   : ^^^^    ^^                 ^^^^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...args : string
 >        : ^^^^^^
 >args : readonly string[]
@@ -110,18 +110,18 @@ function f2(...args: readonly [string, string]) {
 >                 : ^^^^
 >f1 : (...args: readonly string[]) => void
 >   : ^^^^    ^^                 ^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
     f1('abc', ...args);
 >f1('abc', ...args) : void
 >                   : ^^^^
 >f1 : (...args: readonly string[]) => void
 >   : ^^^^    ^^                 ^^^^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...args : string
 >        : ^^^^^^
 >args : readonly [string, string]
@@ -142,18 +142,18 @@ function f2(...args: readonly [string, string]) {
 >                 : ^^^^
 >f2 : (args_0: string, args_1: string) => void
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
     f2('abc', ...args);  // Error
 >f2('abc', ...args) : void
 >                   : ^^^^
 >f2 : (args_0: string, args_1: string) => void
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...args : string
 >        : ^^^^^^
 >args : readonly [string, string]
@@ -177,15 +177,15 @@ function f4(...args: readonly string[]) {
 >     : ^^^^^^^^^^^^^^^^^
 
     args[0] = 'abc';  // Error
->args[0] = 'abc' : string
->                : ^^^^^^
+>args[0] = 'abc' : "abc"
+>                : ^^^^^
 >args[0] : string
 >        : ^^^^^^
 >args : readonly string[]
 >     : ^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/readonlyTupleAndArrayElaboration.types b/tests/baselines/reference/readonlyTupleAndArrayElaboration.types
index 37aabb0b6fa..19aa0053f16 100644
--- a/tests/baselines/reference/readonlyTupleAndArrayElaboration.types
+++ b/tests/baselines/reference/readonlyTupleAndArrayElaboration.types
@@ -182,8 +182,8 @@ const a1: readonly number[] = [1];
 >   : ^^^^^^^^^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const a2: readonly boolean[] = a1;
 >a2 : readonly boolean[]
@@ -196,8 +196,8 @@ const a3: readonly number[] = [1];
 >   : ^^^^^^^^^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const a4: boolean[] = a3;
 >a4 : boolean[]
@@ -210,8 +210,8 @@ const a5: number[] = [1];
 >   : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const a6: readonly boolean [] = a5;
 >a6 : readonly boolean[]
@@ -224,8 +224,8 @@ const a7: number[] = [1];
 >   : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const a8: boolean[] = a7;
 >a8 : boolean[]
@@ -294,8 +294,8 @@ const at1: readonly number[] = [1];
 >    : ^^^^^^^^^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const at2: readonly [1] = at1;
 >at2 : readonly [1]
@@ -308,8 +308,8 @@ const at3: readonly number[] = [1];
 >    : ^^^^^^^^^^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const at4: [1] = at3;
 >at4 : [1]
@@ -322,8 +322,8 @@ const at5: number[] = [1];
 >    : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const at6: readonly [1] = at5;
 >at6 : readonly [1]
@@ -336,8 +336,8 @@ const at7: number[] = [1];
 >    : ^^^^^^^^
 >[1] : number[]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const at8: [1] = at7;
 >at8 : [1]
diff --git a/tests/baselines/reference/recursiveArrayNotCircular.types b/tests/baselines/reference/recursiveArrayNotCircular.types
index a5d52121683..efa256e8590 100644
--- a/tests/baselines/reference/recursiveArrayNotCircular.types
+++ b/tests/baselines/reference/recursiveArrayNotCircular.types
@@ -63,8 +63,8 @@ function assertNever(a: never): never {
 >                          : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unreachable!" : string
->               : ^^^^^^
+>"Unreachable!" : "Unreachable!"
+>               : ^^^^^^^^^^^^^^
 }
 
 function reducer(action: ReducerAction): void {
diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
index abe993edabd..01cfdd9a01e 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
@@ -12,8 +12,8 @@ module TypeScript2 {
         public prefix: string = "";
 >prefix : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     export class MemberNameArray extends MemberName {
 >MemberNameArray : MemberNameArray
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types
index 955f8180398..092de33da33 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.types
+++ b/tests/baselines/reference/recursiveClassReferenceTest.types
@@ -168,8 +168,8 @@ module Sample.Thing.Widgets {
 >          : ^^^^^^^^^^
 >addWidget : (widgetId: string, widget: IWidget) => any
 >          : ^        ^^      ^^      ^^       ^^^^^^^^
->"addWidget" : string
->            : ^^^^^^
+>"addWidget" : "addWidget"
+>            : ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 		}
diff --git a/tests/baselines/reference/recursiveConditionalTypes.types b/tests/baselines/reference/recursiveConditionalTypes.types
index 0a904a9ab85..f09267bc93b 100644
--- a/tests/baselines/reference/recursiveConditionalTypes.types
+++ b/tests/baselines/reference/recursiveConditionalTypes.types
@@ -192,12 +192,12 @@ f23(['a', 'b', 'c']);  // string
 >    : ^ ^^ ^^             ^^^^^ 
 >['a', 'b', 'c'] : [string, string, string]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
->'c' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
+>'c' : "c"
+>    : ^^^
 
 // Inference to recursive type
 
diff --git a/tests/baselines/reference/recursiveFieldSetting.types b/tests/baselines/reference/recursiveFieldSetting.types
index 29830de2959..97513d9b3a2 100644
--- a/tests/baselines/reference/recursiveFieldSetting.types
+++ b/tests/baselines/reference/recursiveFieldSetting.types
@@ -36,8 +36,8 @@ class Recursive1 {
 >      : ^^^^^^
 >1 : 1
 >  : ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class Recursive2 {
diff --git a/tests/baselines/reference/recursiveInference1.types b/tests/baselines/reference/recursiveInference1.types
index 62799b174d7..2725362f0d5 100644
--- a/tests/baselines/reference/recursiveInference1.types
+++ b/tests/baselines/reference/recursiveInference1.types
@@ -40,6 +40,6 @@ var result = fib(5);
 >fib(5) : any
 >fib : (x: number) => any
 >    : ^ ^^      ^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/recursiveTypeReferences1.types b/tests/baselines/reference/recursiveTypeReferences1.types
index 0ac962eadf2..db0722b2e0c 100644
--- a/tests/baselines/reference/recursiveTypeReferences1.types
+++ b/tests/baselines/reference/recursiveTypeReferences1.types
@@ -52,40 +52,40 @@ const hypertextNode: HypertextNode =
     ["div", { id: "parent" },
 >["div", { id: "parent" },        ["div", { id: "first-child" }, "I'm the first child"],        ["div", { id: "second-child" }, "I'm the second child"]    ] : [string, { id: string; }, [string, { id: string; }, string], [string, { id: string; }, string]]
 >                                                                                                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"div" : string
->      : ^^^^^^
+>"div" : "div"
+>      : ^^^^^
 >{ id: "parent" } : { id: string; }
 >                 : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"parent" : string
->         : ^^^^^^
+>"parent" : "parent"
+>         : ^^^^^^^^
 
         ["div", { id: "first-child" }, "I'm the first child"],
 >["div", { id: "first-child" }, "I'm the first child"] : [string, { id: string; }, string]
 >                                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"div" : string
->      : ^^^^^^
+>"div" : "div"
+>      : ^^^^^
 >{ id: "first-child" } : { id: string; }
 >                      : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"first-child" : string
->              : ^^^^^^
+>"first-child" : "first-child"
+>              : ^^^^^^^^^^^^^
 >"I'm the first child" : "I'm the first child"
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 
         ["div", { id: "second-child" }, "I'm the second child"]
 >["div", { id: "second-child" }, "I'm the second child"] : [string, { id: string; }, string]
 >                                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"div" : string
->      : ^^^^^^
+>"div" : "div"
+>      : ^^^^^
 >{ id: "second-child" } : { id: string; }
 >                       : ^^^^^^^^^^^^^^^
 >id : string
 >   : ^^^^^^
->"second-child" : string
->               : ^^^^^^
+>"second-child" : "second-child"
+>               : ^^^^^^^^^^^^^^
 >"I'm the second child" : "I'm the second child"
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -435,8 +435,8 @@ flat1([1, [2, [3]]]);  // (number | number[])[]
 >  : ^
 >[3] : number[]
 >    : ^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 flat1([[[0]]]);  // number[][]
 >flat1([[[0]]]) : number[][]
@@ -449,8 +449,8 @@ flat1([[[0]]]);  // number[][]
 >      : ^^^^^^^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 flat1([1, 'a', [2]]);  // (string | number)[]
 >flat1([1, 'a', [2]]) : (string | number)[]
@@ -465,8 +465,8 @@ flat1([1, 'a', [2]]);  // (string | number)[]
 >    : ^^^
 >[2] : number[]
 >    : ^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 flat1([1, [2, 'a']]);  // (string | number)[]
 >flat1([1, [2, 'a']]) : (string | number)[]
@@ -479,10 +479,10 @@ flat1([1, [2, 'a']]);  // (string | number)[]
 >  : ^
 >[2, 'a'] : (string | number)[]
 >         : ^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->'a' : string
->    : ^^^^^^
+>2 : 2
+>  : ^
+>'a' : "a"
+>    : ^^^
 
 flat1([1, ['a']]);  // Error
 >flat1([1, ['a']]) : string[]
@@ -495,8 +495,8 @@ flat1([1, ['a']]);  // Error
 >  : ^
 >['a'] : string[]
 >      : ^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 flat2([1, [2, [3]]]);  // number[]
 >flat2([1, [2, [3]]]) : number[]
@@ -513,8 +513,8 @@ flat2([1, [2, [3]]]);  // number[]
 >  : ^
 >[3] : number[]
 >    : ^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 flat2([[[0]]]);  // number[]
 >flat2([[[0]]]) : number[]
@@ -527,8 +527,8 @@ flat2([[[0]]]);  // number[]
 >      : ^^^^^^^^^^
 >[0] : number[]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 flat2([1, 'a', [2]]);  // (string | number)[]
 >flat2([1, 'a', [2]]) : (string | number)[]
@@ -757,8 +757,8 @@ function parse(node: Tree, index: number[] = []): HTMLUListElement {
 >    : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->'.' : string
->    : ^^^^^^
+>'.' : "."
+>    : ^^^
 >el.textContent! : string
 >                : ^^^^^^
 >el.textContent : string | null
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index 7f5d8e3b6e9..14fc3c854d5 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -163,7 +163,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
     }
   });
   return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/referenceSatisfiesExpression.types b/tests/baselines/reference/referenceSatisfiesExpression.types
index d51bfaab66a..1d0fb0b0dff 100644
--- a/tests/baselines/reference/referenceSatisfiesExpression.types
+++ b/tests/baselines/reference/referenceSatisfiesExpression.types
@@ -52,16 +52,16 @@ let b: number;
 >  : ^^^^^^
 
 (b satisfies number) = 10;
->(b satisfies number) = 10 : number
->                          : ^^^^^^
+>(b satisfies number) = 10 : 10
+>                          : ^^
 >(b satisfies number) : number
 >                     : ^^^^^^
 >b satisfies number : number
 >                   : ^^^^^^
 >b : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let c: number;
 >c : number
@@ -80,8 +80,8 @@ let c: number;
 >  : ^^^^^^
 >[10] : [number]
 >     : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let d: number, e = 1;
 >d : number
@@ -110,8 +110,8 @@ let d: number, e = 1;
 >          : ^^^^^^^^^^^^^^
 >d : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let g = 1
 >g : number
@@ -147,8 +147,8 @@ for ((g satisfies number) of [10]) {
 let x: string = "hello"
 >x : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 for ((x satisfies string) in { a: 10 }) {
 >(x satisfies string) : string
diff --git a/tests/baselines/reference/regExpWithSlashInCharClass.types b/tests/baselines/reference/regExpWithSlashInCharClass.types
index 324749ee527..64c20b51827 100644
--- a/tests/baselines/reference/regExpWithSlashInCharClass.types
+++ b/tests/baselines/reference/regExpWithSlashInCharClass.types
@@ -14,8 +14,8 @@ var foo1 = "a/".replace(/.[/]/, "");
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/.[/]/ : RegExp
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var foo2 = "a//".replace(/.[//]/g, "");
 >foo2 : string
@@ -30,8 +30,8 @@ var foo2 = "a//".replace(/.[//]/g, "");
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/.[//]/g : RegExp
 >         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
 >foo3 : string
@@ -46,6 +46,6 @@ var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
 >        : ^^^           ^^               ^^            ^^      ^^^      ^^^           ^^               ^^        ^^                                             ^^^      ^^^
 >/.[/no sleep /till/]/ : RegExp
 >                      : ^^^^^^
->"bugfix" : string
->         : ^^^^^^
+>"bugfix" : "bugfix"
+>         : ^^^^^^^^
 
diff --git a/tests/baselines/reference/regexMatchAll-esnext.types b/tests/baselines/reference/regexMatchAll-esnext.types
index fc3811f83af..e8048eb9db3 100644
--- a/tests/baselines/reference/regexMatchAll-esnext.types
+++ b/tests/baselines/reference/regexMatchAll-esnext.types
@@ -16,8 +16,8 @@ const matches = /\w/g[Symbol.matchAll]("matchAll");
 >       : ^^^^^^^^^^^^^^^^^
 >matchAll : unique symbol
 >         : ^^^^^^^^^^^^^
->"matchAll" : string
->           : ^^^^^^
+>"matchAll" : "matchAll"
+>           : ^^^^^^^^^^
 
 const array = [...matches];
 >array : RegExpMatchArray[]
diff --git a/tests/baselines/reference/regexMatchAll.types b/tests/baselines/reference/regexMatchAll.types
index 07f1b1b57bb..acfc292ace7 100644
--- a/tests/baselines/reference/regexMatchAll.types
+++ b/tests/baselines/reference/regexMatchAll.types
@@ -16,8 +16,8 @@ const matches = /\w/g[Symbol.matchAll]("matchAll");
 >       : ^^^^^^^^^^^^^^^^^
 >matchAll : unique symbol
 >         : ^^^^^^^^^^^^^
->"matchAll" : string
->           : ^^^^^^
+>"matchAll" : "matchAll"
+>           : ^^^^^^^^^^
 
 const array = [...matches];
 >array : RegExpMatchArray[]
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.types b/tests/baselines/reference/relativePathToDeclarationFile.types
index 1eb30455808..dbe995b668f 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.types
+++ b/tests/baselines/reference/relativePathToDeclarationFile.types
@@ -48,8 +48,8 @@ if(foo.M2.x){
 >  : ^^^^^^
 >charCodeAt : (index: number) => number
 >           : ^     ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 === test/foo.d.ts ===
diff --git a/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.types b/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.types
index 3eadfc43e66..98e67f1b553 100644
--- a/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.types
+++ b/tests/baselines/reference/renamingDestructuredPropertyInFunctionType.types
@@ -353,8 +353,8 @@ const f5 = ({ a: string, b, c }: O): typeof string => '';
 >  : ^^^^^^
 >string : string
 >       : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 const obj1 = {
 >obj1 : { method({ a: string }: O): void; }
@@ -397,8 +397,8 @@ function f6({ a: string = "" }: O) { }
 >  : ^^^
 >string : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 const f7 = ({ a: string = "", b, c }: O) => { };
 >f7 : ({ a: string, b, c }: O) => void
@@ -409,8 +409,8 @@ const f7 = ({ a: string = "", b, c }: O) => { };
 >  : ^^^
 >string : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
 >c : number
@@ -456,10 +456,10 @@ function f12({ a: string = "" }: O): typeof string { return "a"; }
 >  : ^^^
 >string : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >string : string
 >       : ^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/requireEmitSemicolon.types b/tests/baselines/reference/requireEmitSemicolon.types
index 94445a6b880..052fc709fa1 100644
--- a/tests/baselines/reference/requireEmitSemicolon.types
+++ b/tests/baselines/reference/requireEmitSemicolon.types
@@ -37,7 +37,7 @@ export module Database {
 >       : ^^^^^^^^^^^^^^^
 >Person : typeof P.Models.Person
 >       : ^^^^^^^^^^^^^^^^^^^^^^
->"Rock" : string
+>"Rock" : "Rock"
 >       : ^^^^^^
 	    }
 	}
diff --git a/tests/baselines/reference/requiredInitializedParameter1.types b/tests/baselines/reference/requiredInitializedParameter1.types
index 727dfe0cf10..f78eb7d8655 100644
--- a/tests/baselines/reference/requiredInitializedParameter1.types
+++ b/tests/baselines/reference/requiredInitializedParameter1.types
@@ -58,8 +58,8 @@ f1(0, 1, 2);
 >   : ^ ^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -70,10 +70,10 @@ f2(0, 1, 2);
 >   : ^ ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f3(0, 1, 2);
 >f3(0, 1, 2) : void
@@ -82,8 +82,8 @@ f3(0, 1, 2);
 >   : ^ ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -94,8 +94,8 @@ f4(0, 1, 2);
 >   : ^ ^^^^^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -106,8 +106,8 @@ f1(0, 1);
 >   : ^ ^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f2(0, 1);
 >f2(0, 1) : void
@@ -116,8 +116,8 @@ f2(0, 1);
 >   : ^ ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f3(0, 1);
 >f3(0, 1) : void
@@ -126,8 +126,8 @@ f3(0, 1);
 >   : ^ ^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f4(0, 1);
 >f4(0, 1) : void
@@ -136,8 +136,8 @@ f4(0, 1);
 >   : ^ ^^^^^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f1(0);
 >f1(0) : void
diff --git a/tests/baselines/reference/resolveNameWithNamspace.types b/tests/baselines/reference/resolveNameWithNamspace.types
index 28020afca8e..877b8c757be 100644
--- a/tests/baselines/reference/resolveNameWithNamspace.types
+++ b/tests/baselines/reference/resolveNameWithNamspace.types
@@ -32,8 +32,8 @@ var myAssert = require('assert')
 >require('assert') : any
 >require : (moduleName: string) => any
 >        : ^          ^^      ^^^^^   
->'assert' : string
->         : ^^^^^^
+>'assert' : "assert"
+>         : ^^^^^^^^
 
 === app.js ===
 exports.equal = myAssert.equal
diff --git a/tests/baselines/reference/restArgAssignmentCompat.types b/tests/baselines/reference/restArgAssignmentCompat.types
index 1f13fdfea7c..385410a2afc 100644
--- a/tests/baselines/reference/restArgAssignmentCompat.types
+++ b/tests/baselines/reference/restArgAssignmentCompat.types
@@ -70,8 +70,8 @@ n([4], 'foo');
 >  : ^ ^^        ^^ ^^      ^^^^^^^^^
 >[4] : number[]
 >    : ^^^^^^^^
->4 : number
->  : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>4 : 4
+>  : ^
+>'foo' : "foo"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/restElementMustBeLast.types b/tests/baselines/reference/restElementMustBeLast.types
index 30157bc9320..bcb6051d012 100644
--- a/tests/baselines/reference/restElementMustBeLast.types
+++ b/tests/baselines/reference/restElementMustBeLast.types
@@ -28,10 +28,10 @@ var [...a, x] = [1, 2, 3];  // Error, rest must be last element
 >  : ^^^^^^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern1.types b/tests/baselines/reference/restElementWithAssignmentPattern1.types
index 6198c47d7e7..c73127b2ec4 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern1.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern1.types
@@ -18,16 +18,16 @@ var a: string, b: number;
 >           : ^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->b = 0 : number
->      : ^^^^^^
+>b = 0 : 0
+>      : ^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >["", 1] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern2.types b/tests/baselines/reference/restElementWithAssignmentPattern2.types
index 228ba45d341..e20082df2ae 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern2.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern2.types
@@ -18,18 +18,18 @@ var a: string, b: number;
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->a = "" : string
->       : ^^^^^^
+>a = "" : ""
+>       : ^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
 >["", 1] : (string | number)[]
 >        : ^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern3.types b/tests/baselines/reference/restElementWithAssignmentPattern3.types
index 3e579815186..cfd2efc9bd6 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern3.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern3.types
@@ -12,10 +12,10 @@ var tuple: [string, number] = ["", 1];
 >      : ^^^^^^^^^^^^^^^^
 >["", 1] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 [...[a, b = 0]] = tuple;
 >[...[a, b = 0]] = tuple : [string, number]
@@ -28,12 +28,12 @@ var tuple: [string, number] = ["", 1];
 >           : ^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->b = 0 : number
->      : ^^^^^^
+>b = 0 : 0
+>      : ^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >tuple : [string, number]
 >      : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern4.types b/tests/baselines/reference/restElementWithAssignmentPattern4.types
index 986993e79dc..bdaeebc3f79 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern4.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern4.types
@@ -12,10 +12,10 @@ var tuple: [string, number] = ["", 1];
 >      : ^^^^^^^^^^^^^^^^
 >["", 1] : [string, number]
 >        : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 [...{ 0: a = "", b }] = tuple;
 >[...{ 0: a = "", b }] = tuple : [string, number]
@@ -28,12 +28,12 @@ var tuple: [string, number] = ["", 1];
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : string
 >  : ^^^^^^
->a = "" : string
->       : ^^^^^^
+>a = "" : ""
+>       : ^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >b : number
 >  : ^^^^^^
 >tuple : [string, number]
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern5.types b/tests/baselines/reference/restElementWithAssignmentPattern5.types
index 45ebfa42601..ee9a32a6e50 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern5.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern5.types
@@ -22,8 +22,8 @@ var s: string, s2: string;
 >   : ^^^^^^
 >["", ""] : [string, string]
 >         : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/restParameterTypeInstantiation.types b/tests/baselines/reference/restParameterTypeInstantiation.types
index 723ef07cfd8..c28614ecaa6 100644
--- a/tests/baselines/reference/restParameterTypeInstantiation.types
+++ b/tests/baselines/reference/restParameterTypeInstantiation.types
@@ -41,12 +41,12 @@ const result: number = removeF<number>({ f: '', g: 3 }).g
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >g : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >g : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/restParameterWithBindingPattern3.types b/tests/baselines/reference/restParameterWithBindingPattern3.types
index 68dea472c3e..16f198759f9 100644
--- a/tests/baselines/reference/restParameterWithBindingPattern3.types
+++ b/tests/baselines/reference/restParameterWithBindingPattern3.types
@@ -6,8 +6,8 @@ function a(...[a = 1, b = true]: string[]) { }
 >  : ^^^^      ^^        ^^^^^^^^^
 >a : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : string
 >  : ^^^^^^
 >true : true
diff --git a/tests/baselines/reference/restTupleElements1.types b/tests/baselines/reference/restTupleElements1.types
index d31d07bcb52..da0a8474598 100644
--- a/tests/baselines/reference/restTupleElements1.types
+++ b/tests/baselines/reference/restTupleElements1.types
@@ -260,8 +260,8 @@ f0([1]);
 >   : ^ ^^ ^^ ^^           ^^^^^      
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 f0([1, 2, 3]);
 >f0([1, 2, 3]) : [number, number]
@@ -270,12 +270,12 @@ f0([1, 2, 3]);
 >   : ^ ^^ ^^ ^^           ^^^^^      
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 f0([1, "hello", true]);
 >f0([1, "hello", true]) : [number, string | boolean]
@@ -284,8 +284,8 @@ f0([1, "hello", true]);
 >   : ^ ^^ ^^ ^^           ^^^^^      
 >[1, "hello", true] : [number, string, true]
 >                   : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >"hello" : "hello"
 >        : ^^^^^^^
 >true : true
@@ -350,8 +350,8 @@ f1([x => x * 2, x => x.length, x => x.charCodeAt(0)]);
 >  : ^^^^^^
 >charCodeAt : (index: number) => number
 >           : ^     ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 f2(x => x * 2, x => x.length, x => x.charCodeAt(0));
 >f2(x => x * 2, x => x.length, x => x.charCodeAt(0)) : void
@@ -390,6 +390,6 @@ f2(x => x * 2, x => x.length, x => x.charCodeAt(0));
 >  : ^^^^^^
 >charCodeAt : (index: number) => number
 >           : ^     ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.types b/tests/baselines/reference/restTuplesFromContextualTypes.types
index a51eba9c127..655c5f92bd6 100644
--- a/tests/baselines/reference/restTuplesFromContextualTypes.types
+++ b/tests/baselines/reference/restTuplesFromContextualTypes.types
@@ -350,8 +350,8 @@ declare const t3: [boolean, ...string[]];
 >  : ^^^^^^^
 >c : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...t3 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t3 : [boolean, ...string[]]
@@ -366,8 +366,8 @@ declare const t3: [boolean, ...string[]];
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : [number, boolean, ...string[]]
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...t3 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t3 : [boolean, ...string[]]
@@ -384,8 +384,8 @@ declare const t3: [boolean, ...string[]];
 >  : ^^^^^^
 >x : [boolean, ...string[]]
 >  : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...t3 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t3 : [boolean, ...string[]]
@@ -404,8 +404,8 @@ declare const t3: [boolean, ...string[]];
 >  : ^^^^^^^
 >x : string[]
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...t3 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t3 : [boolean, ...string[]]
@@ -426,8 +426,8 @@ declare const t3: [boolean, ...string[]];
 >  : ^^^^^^
 >x : string[]
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...t3 : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >t3 : [boolean, ...string[]]
@@ -542,8 +542,8 @@ function f4<T extends any[]>(t: T) {
 >  : ^^^^^^
 >x : T
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...t : any
 >     : ^^^
 >t : T
@@ -560,10 +560,10 @@ function f4<T extends any[]>(t: T) {
 >  : ^^^^^^
 >x : [number, ...T]
 >  : ^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >...t : any
 >     : ^^^
 >t : T
@@ -635,8 +635,8 @@ let g0 = f5(() => "hello");
 >   : ^ ^^^^^^^^^     ^^ ^^ ^^                 ^^^^^                 
 >() => "hello" : () => string
 >              : ^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let g1 = f5((x, y) => 42);
 >g1 : (x: any, y: any) => number
@@ -651,8 +651,8 @@ let g1 = f5((x, y) => 42);
 >  : ^^^
 >y : any
 >  : ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let g2 = f5((x: number, y) => 42);
 >g2 : (x: number, y: any) => number
@@ -667,8 +667,8 @@ let g2 = f5((x: number, y) => 42);
 >  : ^^^^^^
 >y : any
 >  : ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let g3 = f5((x: number, y: number) => x + y);
 >g3 : (x: number, y: number) => number
@@ -733,8 +733,8 @@ let g5 = pipe(() => true, b => 42);
 >        : ^ ^^^^^^^^^^^^^^^^^^^^
 >b : boolean
 >  : ^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 let g6 = pipe(x => "hello", s => s.length);
 >g6 : (x: any) => number
@@ -747,8 +747,8 @@ let g6 = pipe(x => "hello", s => s.length);
 >             : ^ ^^^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >s => s.length : (s: string) => number
 >              : ^ ^^^^^^^^^^^^^^^^^^^
 >s : string
@@ -773,8 +773,8 @@ let g7 = pipe((x, y) => 42, x => "" + x);
 >  : ^^^
 >y : any
 >  : ^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >x => "" + x : (x: number) => string
 >            : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -799,8 +799,8 @@ let g8 = pipe((x: number, y: string) => 42, x => "" + x);
 >  : ^^^^^^
 >y : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >x => "" + x : (x: number) => string
 >            : ^ ^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -859,10 +859,10 @@ declare function take(cb: (a: number, b: string) => void): void;
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >rest : [number, string]
 >     : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 take(function(...rest){});
 >take(function(...rest){}) : void
diff --git a/tests/baselines/reference/returnInConstructor1.types b/tests/baselines/reference/returnInConstructor1.types
index c37b1cf7bb2..abf7de2346e 100644
--- a/tests/baselines/reference/returnInConstructor1.types
+++ b/tests/baselines/reference/returnInConstructor1.types
@@ -73,8 +73,8 @@ class E {
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -92,8 +92,8 @@ class F {
 >           : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -115,16 +115,16 @@ class G {
 
     constructor() {
         this.test = 2;
->this.test = 2 : number
->              : ^^^^^^
+>this.test = 2 : 2
+>              : ^
 >this.test : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >test : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/returnInfiniteIntersection.types b/tests/baselines/reference/returnInfiniteIntersection.types
index 66f44691d50..a622308a960 100644
--- a/tests/baselines/reference/returnInfiniteIntersection.types
+++ b/tests/baselines/reference/returnInfiniteIntersection.types
@@ -36,6 +36,6 @@ let result = recursive()(1)
 >            : ^^ ^^      ^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >recursive : () => (<T>(subkey: T) => any & { p: any; }) & { p: any; }
 >          : ^^^^^^^^ ^^      ^^ ^^^^^^^^^^^^^^^^^^^^^^^        ^^^   
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/returnStatements.types b/tests/baselines/reference/returnStatements.types
index 1d7847c1803..34d8dce5da6 100644
--- a/tests/baselines/reference/returnStatements.types
+++ b/tests/baselines/reference/returnStatements.types
@@ -5,14 +5,14 @@
 function fn1(): number { return 1; }
 >fn1 : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function fn2(): string { return ''; }
 >fn2 : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 function fn3(): void { return undefined; }
 >fn3 : () => void
@@ -37,8 +37,8 @@ function fn6(): Date { return new Date(12); }
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 function fn7(): any { return null; }
 >fn7 : () => any
@@ -81,8 +81,8 @@ function fn10(): I { return { id: 12 }; }
 >           : ^^^^^^^^^^^^^^^
 >id : number
 >   : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 function fn11(): I { return new C(); }
 >fn11 : () => I
diff --git a/tests/baselines/reference/returnTypeInferenceNotTooBroad.types b/tests/baselines/reference/returnTypeInferenceNotTooBroad.types
index 9e08f7f0290..149c7971b59 100644
--- a/tests/baselines/reference/returnTypeInferenceNotTooBroad.types
+++ b/tests/baselines/reference/returnTypeInferenceNotTooBroad.types
@@ -51,8 +51,8 @@ export const y = sepsis({ low: 1, sign: { kind: 'a', a: 3 }});
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >low : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >sign : { kind: "a"; a: 3; }
 >     : ^^^^^^^^^^^^^^^^^^^^
 >{ kind: 'a', a: 3 } : { kind: "a"; a: 3; }
@@ -93,8 +93,8 @@ export const yone = unwrap(sepsis({ low: 1, sign: { kind: 'a', a: 3 }}));
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >low : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >sign : { kind: "a"; a: 3; }
 >     : ^^^^^^^^^^^^^^^^^^^^
 >{ kind: 'a', a: 3 } : { kind: "a"; a: 3; }
diff --git a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
index a5a9d8a9768..4f23a1f3f3d 100644
--- a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
+++ b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
@@ -8,8 +8,8 @@ function compare<T>(a: T, b: T): number { return 0; }
 >  : ^
 >b : T
 >  : ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var x: number[];
 >x : number[]
diff --git a/tests/baselines/reference/reverseMappedContravariantInference.types b/tests/baselines/reference/reverseMappedContravariantInference.types
index 3e3dbac9679..da070f1c6ca 100644
--- a/tests/baselines/reference/reverseMappedContravariantInference.types
+++ b/tests/baselines/reference/reverseMappedContravariantInference.types
@@ -34,6 +34,6 @@ conforms({ foo: (v: string) => false })({ foo: "hello" });
 >                 : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types b/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types
index df1012017e0..50e7502dd42 100644
--- a/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types
+++ b/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types
@@ -246,8 +246,8 @@ const obj1 = id({
         contents: ""
 >contents : string
 >         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
 });
 
@@ -272,8 +272,8 @@ const obj2 = id({
         contents: "",
 >contents : string
 >         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         contains(k) {
 >contains : (k: string) => boolean
@@ -366,8 +366,8 @@ inferMapped1({
 >    : ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[3, arg => arg.key > 5] : [number, (arg: { key: number; }) => boolean]
 >                        : ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >arg => arg.key > 5 : (arg: { key: number; }) => boolean
 >                   : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >arg : { key: number; }
@@ -414,8 +414,8 @@ inferMapped2({
 >    : ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[3, arg => arg.key > 5] : [number, (arg: { key: number; }) => boolean]
 >                        : ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >arg => arg.key > 5 : (arg: { key: number; }) => boolean
 >                   : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >arg : { key: number; }
@@ -462,8 +462,8 @@ inferMappedReadonly({
 >    : ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[3, arg => arg.key > 5] : [number, (arg: { key: number; }) => boolean]
 >                        : ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >arg => arg.key > 5 : (arg: { key: number; }) => boolean
 >                   : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >arg : { key: number; }
diff --git a/tests/baselines/reference/reverseMappedTupleContext.types b/tests/baselines/reference/reverseMappedTupleContext.types
index aa610d08092..0bf6a06757e 100644
--- a/tests/baselines/reference/reverseMappedTupleContext.types
+++ b/tests/baselines/reference/reverseMappedTupleContext.types
@@ -20,10 +20,10 @@ const result1 = test1(["foo", 42]);
 >      : ^ ^^   ^^                         ^^^^^ 
 >["foo", 42] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->42 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>42 : 42
+>   : ^^
 
 declare function test2<T extends readonly unknown[]>(arg: {
 >test2 : <T extends readonly unknown[]>(arg: { [K in keyof T]: T[K]; }) => T
@@ -42,10 +42,10 @@ const result2 = test2(["foo", 42]);
 >      : ^ ^^^^^^^^^                  ^^   ^^                         ^^^^^ 
 >["foo", 42] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->42 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>42 : 42
+>   : ^^
 
 type Schema = Record<string, unknown> | readonly unknown[];
 >Schema : Schema
@@ -74,14 +74,14 @@ const created1 = create([() => 1, [() => ""]]);
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[() => ""] : [() => string]
 >           : ^^^^^^^^^^^^^^
 >() => "" : () => string
 >         : ^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 const created2 = create({
 >created2 : { a: number; b: [string]; }
@@ -98,8 +98,8 @@ const created2 = create({
 >  : ^^^^^^^^^^^^
 >() => 1 : () => number
 >        : ^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   b: [() => ""],
 >b : [() => string]
@@ -108,8 +108,8 @@ const created2 = create({
 >           : ^^^^^^^^^^^^^^
 >() => "" : () => string
 >         : ^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 });
 
diff --git a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types
index ab5800e2260..656259e8eb9 100644
--- a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types
+++ b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types
@@ -159,8 +159,8 @@ const checked = checkType<{x: number, y: string}>()({
 >  : ^^^^^^
 >1 as number : number
 >            : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   y: "y",
 >y : "y"
@@ -493,8 +493,8 @@ const wnp = withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 });
 >                : ^^^^^^^^^^^^^^^^^
 >prop : string
 >     : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 >extra : number
 >      : ^^^^^^
 >10 : 10
diff --git a/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types
index f3fc64c7b79..62a5ce588c9 100644
--- a/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types
+++ b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types
@@ -64,8 +64,8 @@ const checked_ = checkType_<{x: number, y: string}>()({
 >  : ^^^^^^
 >1 as number : number
 >            : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   y: "y",
 >y : "y"
diff --git a/tests/baselines/reference/reverseMappedTypePrimitiveConstraintProperty.types b/tests/baselines/reference/reverseMappedTypePrimitiveConstraintProperty.types
index 89ffb29293c..f5224741f2c 100644
--- a/tests/baselines/reference/reverseMappedTypePrimitiveConstraintProperty.types
+++ b/tests/baselines/reference/reverseMappedTypePrimitiveConstraintProperty.types
@@ -42,15 +42,15 @@ const result = test({
     nestedProp: "bar",
 >nestedProp : string
 >           : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
   },
   extra: "baz",
 >extra : string
 >      : ^^^^^^
->"baz" : string
->      : ^^^^^^
+>"baz" : "baz"
+>      : ^^^^^
 
 });
 
diff --git a/tests/baselines/reference/reversedRecusiveTypeInstantiation.types b/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
index d56fa6fdf15..b206e6db552 100644
--- a/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
+++ b/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
@@ -20,8 +20,8 @@ var a : A<string, number>
 >  : ^^^^^^^^^^^^^^^^^
 
 a.zPos2Pos1.xPos1 = 1
->a.zPos2Pos1.xPos1 = 1 : number
->                      : ^^^^^^
+>a.zPos2Pos1.xPos1 = 1 : 1
+>                      : ^
 >a.zPos2Pos1.xPos1 : number
 >                  : ^^^^^^
 >a.zPos2Pos1 : A<number, string>
@@ -32,7 +32,7 @@ a.zPos2Pos1.xPos1 = 1
 >          : ^^^^^^^^^^^^^^^^^
 >xPos1 : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
diff --git a/tests/baselines/reference/scannerS7.2_A1.5_T2.types b/tests/baselines/reference/scannerS7.2_A1.5_T2.types
index 2ff7a9626c4..c275739768c 100644
--- a/tests/baselines/reference/scannerS7.2_A1.5_T2.types
+++ b/tests/baselines/reference/scannerS7.2_A1.5_T2.types
@@ -17,8 +17,8 @@ eval("\u00A0var x\u00A0= 1\u00A0");
 >                                   : ^^^
 >eval : (x: string) => any
 >     : ^ ^^      ^^^^^   
->"\u00A0var x\u00A0= 1\u00A0" : string
->                             : ^^^^^^
+>"\u00A0var x\u00A0= 1\u00A0" : " var x = 1 "
+>                             : ^^^^^^^^^^^^^
 
 if (x !== 1) {
 >x !== 1 : boolean
diff --git a/tests/baselines/reference/scopeTests.types b/tests/baselines/reference/scopeTests.types
index 4a4120106ee..f7b0ab19b13 100644
--- a/tests/baselines/reference/scopeTests.types
+++ b/tests/baselines/reference/scopeTests.types
@@ -33,28 +33,28 @@ class D extends C {
 >      : ^^^^^^^^
 
    this.v = 1;
->this.v = 1 : number
->           : ^^^^^^
+>this.v = 1 : 1
+>           : ^
 >this.v : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >v : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
    this.p = 1;
->this.p = 1 : number
->           : ^^^^^^
+>this.p = 1 : 1
+>           : ^
 >this.p : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >p : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
    C.s = 1;
 >C.s = 1 : 1
diff --git a/tests/baselines/reference/setMethods.types b/tests/baselines/reference/setMethods.types
index e55d9cb5a45..b588f6acd14 100644
--- a/tests/baselines/reference/setMethods.types
+++ b/tests/baselines/reference/setMethods.types
@@ -10,12 +10,12 @@ let numberSet = new Set([0, 1, 2]);
 >    : ^^^^^^^^^^^^^^
 >[0, 1, 2] : number[]
 >          : ^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 let stringSet = new Set(["a", "b"]);
 >stringSet : Set<string>
@@ -26,10 +26,10 @@ let stringSet = new Set(["a", "b"]);
 >    : ^^^^^^^^^^^^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 let numberMap = new Map([[4, {}], [5, {}]]);
 >numberMap : Map<number, {}>
@@ -42,14 +42,14 @@ let numberMap = new Map([[4, {}], [5, {}]]);
 >                   : ^^^^^^^^^^^^^^
 >[4, {}] : [number, {}]
 >        : ^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >{} : {}
 >   : ^^
 >[5, {}] : [number, {}]
 >        : ^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{} : {}
 >   : ^^
 
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types
index 2456afd68f2..dfaaa2fe5c2 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types
+++ b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types
@@ -215,12 +215,12 @@
 >              : ^^^^^^^^^^^^^^^^
 >s3 : number
 >   : ^^^^^^
->s3 = 5 : number
->       : ^^^^^^
+>s3 = 5 : 5
+>       : ^
 >s3 : string
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >[{ s3: "" }] : { s3: string; }[]
 >             : ^^^^^^^^^^^^^^^^^
 >{ s3: "" } : { s3: string; }
@@ -291,8 +291,8 @@
 >         : ^^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
@@ -321,8 +321,8 @@
 >          : ^^^^^^^^^^^^^^^^
 >y0 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
@@ -345,18 +345,18 @@
 >              : ^^^^^^^^^^^^^^^^
 >y0 : number
 >   : ^^^^^^
->y0 = 5 : number
->       : ^^^^^^
+>y0 = 5 : 5
+>       : ^
 >y0 : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{ y0: 1 } : { y0?: number; }
 >          : ^^^^^^^^^^^^^^^^
 >y0 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
@@ -405,12 +405,12 @@
 >              : ^^^^^^^^^^^^^^^^
 >y1 : number
 >   : ^^^^^^
->y1 = 5 : number
->       : ^^^^^^
+>y1 = 5 : 5
+>       : ^
 >y1 : string
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{} : { y1?: number; }
 >   : ^^^^^^^^^^^^^^^^
 
@@ -477,12 +477,12 @@
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >y2 : number
 >   : ^^^^^^
->y2 = 5 : number
->       : ^^^^^^
+>y2 = 5 : 5
+>       : ^
 >y2 : string
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y3 : { x: number; }
 >   : ^^^^^^^^^^^^^^
 >y3 = { x: 1 } : { x: number; }
@@ -493,8 +493,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{} : { y2?: number; y3?: { x: number; }; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -561,12 +561,12 @@
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >y4 : number
 >   : ^^^^^^
->y4 = 5 : number
->       : ^^^^^^
+>y4 = 5 : 5
+>       : ^
 >y4 : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y5 : { x: number; }
 >   : ^^^^^^^^^^^^^^
 >y5 = { x: 1 } : { x: number; }
@@ -577,8 +577,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{} : { y4?: number; y5?: { x: number; }; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -661,8 +661,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types
index b66c4ac2198..b713ddd3e4d 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types
+++ b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types
@@ -215,12 +215,12 @@
 >              : ^^^^^^^^^^^^^^^^
 >s3 : number
 >   : ^^^^^^
->s3 = 5 : number
->       : ^^^^^^
+>s3 = 5 : 5
+>       : ^
 >s3 : string
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >[{ s3: "" }] : { s3: string; }[]
 >             : ^^^^^^^^^^^^^^^^^
 >{ s3: "" } : { s3: string; }
@@ -291,8 +291,8 @@
 >         : ^^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
@@ -321,8 +321,8 @@
 >          : ^^^^^^^^^^^^^^^^
 >y0 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
@@ -345,18 +345,18 @@
 >              : ^^^^^^^^^^^^^^^^
 >y0 : number
 >   : ^^^^^^
->y0 = 5 : number
->       : ^^^^^^
+>y0 = 5 : 5
+>       : ^
 >y0 : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{ y0: 1 } : { y0?: number; }
 >          : ^^^^^^^^^^^^^^^^
 >y0 : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
@@ -405,12 +405,12 @@
 >              : ^^^^^^^^^^^^^^^^
 >y1 : number
 >   : ^^^^^^
->y1 = 5 : number
->       : ^^^^^^
+>y1 = 5 : 5
+>       : ^
 >y1 : string
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{} : { y1?: number; }
 >   : ^^^^^^^^^^^^^^^^
 
@@ -477,12 +477,12 @@
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >y2 : number
 >   : ^^^^^^
->y2 = 5 : number
->       : ^^^^^^
+>y2 = 5 : 5
+>       : ^
 >y2 : string
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y3 : { x: number; }
 >   : ^^^^^^^^^^^^^^
 >y3 = { x: 1 } : { x: number; }
@@ -493,8 +493,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{} : { y2?: number; y3?: { x: number; }; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -561,12 +561,12 @@
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >y4 : number
 >   : ^^^^^^
->y4 = 5 : number
->       : ^^^^^^
+>y4 = 5 : 5
+>       : ^
 >y4 : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y5 : { x: number; }
 >   : ^^^^^^^^^^^^^^
 >y5 = { x: 1 } : { x: number; }
@@ -577,8 +577,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{} : { y4?: number; y5?: { x: number; }; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -661,8 +661,8 @@
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 });
 
diff --git a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
index 9e046142673..1058363a7df 100644
--- a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
+++ b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
@@ -62,8 +62,8 @@ let c1 = pInst.optionalParam('hello')
 >      : ^^^^^^^
 >optionalParam : (required: string, notRequired?: string) => MyClass
 >              : ^        ^^      ^^           ^^^      ^^^^^       
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 let c2 = pInst.optionalParam('hello', null)
 >c2 : MyClass
@@ -76,6 +76,6 @@ let c2 = pInst.optionalParam('hello', null)
 >      : ^^^^^^^
 >optionalParam : (required: string, notRequired?: string) => MyClass
 >              : ^        ^^      ^^           ^^^      ^^^^^       
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/silentNeverPropagation.types b/tests/baselines/reference/silentNeverPropagation.types
index 9d5cc55c633..933843c9f53 100644
--- a/tests/baselines/reference/silentNeverPropagation.types
+++ b/tests/baselines/reference/silentNeverPropagation.types
@@ -64,8 +64,8 @@ const breaks = convert(
 >          : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >{ foo() { return true } } : { foo(): true; }
 >                          : ^^^^^^^^^^^^^^^^
 >foo : () => true
diff --git a/tests/baselines/reference/simpleRecursionWithBaseCase1.types b/tests/baselines/reference/simpleRecursionWithBaseCase1.types
index a36245c106f..eba67eeec51 100644
--- a/tests/baselines/reference/simpleRecursionWithBaseCase1.types
+++ b/tests/baselines/reference/simpleRecursionWithBaseCase1.types
@@ -87,8 +87,8 @@ function fn3(n: number) {
 >                   : ^^^^^^
 >fn1 : (n: number) => number
 >    : ^ ^^      ^^^^^^^^^^^
->"hello world" : string
->              : ^^^^^^
+>"hello world" : "hello world"
+>              : ^^^^^^^^^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/sliceResultCast.types b/tests/baselines/reference/sliceResultCast.types
index 38ce2459c9a..20df45adcf6 100644
--- a/tests/baselines/reference/sliceResultCast.types
+++ b/tests/baselines/reference/sliceResultCast.types
@@ -16,6 +16,6 @@ x.slice(1) as readonly string[];
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >slice : ((start?: number, end?: number) => (string | number)[]) | ((start?: number, end?: number) => (string | number)[])
 >      : ^^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types b/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types
index 911738fc235..44a5c4ceb2a 100644
--- a/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types
+++ b/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types
@@ -67,8 +67,8 @@ const x: Foo = (void 0, {
                 d: 42
 >d : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
             }
         })
     }
diff --git a/tests/baselines/reference/sourceMap-Comments.types b/tests/baselines/reference/sourceMap-Comments.types
index 313c7557c5a..237c24a863a 100644
--- a/tests/baselines/reference/sourceMap-Comments.types
+++ b/tests/baselines/reference/sourceMap-Comments.types
@@ -18,8 +18,8 @@ module sas.tools {
             let f: number = 2;
 >f : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
             switch (f) {
 >f : number
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types
index 0d9446dde29..3ee2579e00e 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.types
+++ b/tests/baselines/reference/sourceMap-FileWithComments.types
@@ -76,10 +76,10 @@ module Shapes {
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
     }
 
     // Variable comment after class
@@ -116,10 +116,10 @@ var p: IPoint = new Shapes.Point(3, 4);
 >       : ^^^^^^^^^^^^^
 >Point : typeof Shapes.Point
 >      : ^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 var dist = p.getDist();
 >dist : number
diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types
index a867f630e2c..18833168898 100644
--- a/tests/baselines/reference/sourceMapSample.types
+++ b/tests/baselines/reference/sourceMapSample.types
@@ -69,8 +69,8 @@ module Foo.Bar {
 >                             : ^^^^^^^
 >Greeter : typeof Greeter
 >        : ^^^^^^^^^^^^^^
->"Hello, world!" : string
->                : ^^^^^^
+>"Hello, world!" : "Hello, world!"
+>                : ^^^^^^^^^^^^^^^
 
     var str = greeter.greet();
 >str : string
@@ -167,12 +167,12 @@ module Foo.Bar {
 >                            : ^^^^^^^^^
 >foo2 : (greeting: string, ...restGreetings: string[]) => Greeter[]
 >     : ^        ^^      ^^^^^             ^^        ^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->"World" : string
->        : ^^^^^^
->"!" : string
->    : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>"World" : "World"
+>        : ^^^^^^^
+>"!" : "!"
+>    : ^^^
 
     for (var j = 0; j < b.length; j++) {
 >j : number
diff --git a/tests/baselines/reference/sourceMapValidationClass.types b/tests/baselines/reference/sourceMapValidationClass.types
index 7098122c6ff..65fa7a9b790 100644
--- a/tests/baselines/reference/sourceMapValidationClass.types
+++ b/tests/baselines/reference/sourceMapValidationClass.types
@@ -38,8 +38,8 @@ class Greeter {
     private x1: number = 10;
 >x1 : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     private fn() {
 >fn : () => string
diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types
index c572fb13e94..15c3c6d1dac 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.types
+++ b/tests/baselines/reference/sourceMapValidationClasses.types
@@ -65,8 +65,8 @@ module Foo.Bar {
 >                             : ^^^^^^^
 >Greeter : typeof Greeter
 >        : ^^^^^^^^^^^^^^
->"Hello, world!" : string
->                : ^^^^^^
+>"Hello, world!" : "Hello, world!"
+>                : ^^^^^^^^^^^^^^^
 
     var str = greeter.greet();
 >str : string
@@ -163,12 +163,12 @@ module Foo.Bar {
 >                            : ^^^^^^^^^
 >foo2 : (greeting: string, ...restGreetings: string[]) => Greeter[]
 >     : ^        ^^      ^^^^^             ^^        ^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
->"World" : string
->        : ^^^^^^
->"!" : string
->    : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
+>"World" : "World"
+>        : ^^^^^^^
+>"!" : "!"
+>    : ^^^
 
     // This is simple signle line comment
     for (var j = 0; j < b.length; j++) {
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.types b/tests/baselines/reference/sourceMapValidationDecorators.types
index f50858d34f2..9d156eec61d 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.types
+++ b/tests/baselines/reference/sourceMapValidationDecorators.types
@@ -68,8 +68,8 @@ declare function ParameterDecorator2(x: number): (target: Object, key: string |
 >                    : ^      ^^        ^^^^^    
 >ClassDecorator2 : (x: number) => (target: Function) => void
 >                : ^ ^^      ^^^^^                          
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 class Greeter {
 >Greeter : Greeter
@@ -85,8 +85,8 @@ class Greeter {
 >                        : ^      ^^      ^^   ^^               ^^          ^^      ^^^^^    
 >ParameterDecorator2 : (x: number) => (target: Object, key: string | symbol, paramIndex: number) => void
 >                    : ^ ^^      ^^^^^                                                                  
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
       public greeting: string, 
 >greeting : string
@@ -101,8 +101,8 @@ class Greeter {
 >                        : ^      ^^      ^^   ^^               ^^          ^^      ^^^^^    
 >ParameterDecorator2 : (x: number) => (target: Object, key: string | symbol, paramIndex: number) => void
 >                    : ^ ^^      ^^^^^                                                                  
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 
       ...b: string[]) {
 >b : string[]
@@ -118,8 +118,8 @@ class Greeter {
 >                       : ^      ^^      ^^   ^^               ^^          ^^^                  ^^^^^    
 >PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
 >                   : ^ ^^      ^^^^^                                                                               
->40 : number
->   : ^^^^^^
+>40 : 40
+>   : ^^
 
     greet() {
 >greet : () => string
@@ -151,8 +151,8 @@ class Greeter {
 >                       : ^      ^^      ^^   ^^               ^^          ^^^                  ^^^^^    
 >PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
 >                   : ^ ^^      ^^^^^                                                                               
->50 : number
->   : ^^^^^^
+>50 : 50
+>   : ^^
 
     private x: string;
 >x : string
@@ -167,14 +167,14 @@ class Greeter {
 >                       : ^      ^^      ^^   ^^               ^^          ^^^                  ^^^^^    
 >PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
 >                   : ^ ^^      ^^^^^                                                                               
->60 : number
->   : ^^^^^^
+>60 : 60
+>   : ^^
 
     private static x1: number = 10;
 >x1 : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     
     private fn(
 >fn : (x: number) => string
@@ -189,8 +189,8 @@ class Greeter {
 >                        : ^      ^^      ^^   ^^               ^^          ^^      ^^^^^    
 >ParameterDecorator2 : (x: number) => (target: Object, key: string | symbol, paramIndex: number) => void
 >                    : ^ ^^      ^^^^^                                                                  
->70 : number
->   : ^^^^^^
+>70 : 70
+>   : ^^
 
       x: number) {
 >x : number
@@ -214,8 +214,8 @@ class Greeter {
 >                       : ^      ^^      ^^   ^^               ^^          ^^^                  ^^^^^    
 >PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
 >                   : ^ ^^      ^^^^^                                                                               
->80 : number
->   : ^^^^^^
+>80 : 80
+>   : ^^
 
     get greetings() {
 >greetings : string
@@ -243,8 +243,8 @@ class Greeter {
 >                        : ^      ^^      ^^   ^^               ^^          ^^      ^^^^^    
 >ParameterDecorator2 : (x: number) => (target: Object, key: string | symbol, paramIndex: number) => void
 >                    : ^ ^^      ^^^^^                                                                  
->90 : number
->   : ^^^^^^
+>90 : 90
+>   : ^^
 
       greetings: string) {
 >greetings : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types
index aa1295f6504..11a3aa5c224 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types
@@ -23,12 +23,12 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function getRobot() {
 >getRobot : () => Robot
@@ -44,28 +44,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getMultiRobot() {
 >getMultiRobot : () => MultiSkilledRobot
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types
index 4ded468863a..4e98942c92a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types
@@ -23,12 +23,12 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function getRobot() {
 >getRobot : () => Robot
@@ -44,28 +44,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getMultiRobot() {
 >getMultiRobot : () => MultiSkilledRobot
@@ -113,8 +113,8 @@ let i: number;
 >  : ^^^^^^
 
 for ([, nameA] = robotA, i = 0; i < 1; i++) {
->[, nameA] = robotA, i = 0 : number
->                          : ^^^^^^
+>[, nameA] = robotA, i = 0 : 0
+>                          : ^
 >[, nameA] = robotA : Robot
 >                   : ^^^^^
 >[, nameA] : [undefined, string]
@@ -125,12 +125,12 @@ for ([, nameA] = robotA, i = 0; i < 1; i++) {
 >      : ^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -155,8 +155,8 @@ for ([, nameA] = robotA, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([, nameA] = getRobot(), i = 0; i < 1; i++) {
->[, nameA] = getRobot(), i = 0 : number
->                              : ^^^^^^
+>[, nameA] = getRobot(), i = 0 : 0
+>                              : ^
 >[, nameA] = getRobot() : Robot
 >                       : ^^^^^
 >[, nameA] : [undefined, string]
@@ -169,12 +169,12 @@ for ([, nameA] = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -199,8 +199,8 @@ for ([, nameA] = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([, nameA] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[, nameA] = [2, "trimmer", "trimming"], i = 0 : number
->                                              : ^^^^^^
+>[, nameA] = [2, "trimmer", "trimming"], i = 0 : 0
+>                                              : ^
 >[, nameA] = [2, "trimmer", "trimming"] : [number, string, string]
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[, nameA] : [undefined, string]
@@ -211,18 +211,18 @@ for ([, nameA] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >      : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -247,8 +247,8 @@ for ([, nameA] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) {
->[, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0 : number
->                                                          : ^^^^^^
+>[, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0 : 0
+>                                                          : ^
 >[, [primarySkillA, secondarySkillA]] = multiRobotA : MultiSkilledRobot
 >                                                   : ^^^^^^^^^^^^^^^^^
 >[, [primarySkillA, secondarySkillA]] : [undefined, [string, string]]
@@ -263,12 +263,12 @@ for ([, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) {
 >                : ^^^^^^
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -293,8 +293,8 @@ for ([, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) {
 >              : ^^^^^^
 }
 for ([, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) {
->[, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0 : number
->                                                              : ^^^^^^
+>[, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0 : 0
+>                                                              : ^
 >[, [primarySkillA, secondarySkillA]] = getMultiRobot() : MultiSkilledRobot
 >                                                       : ^^^^^^^^^^^^^^^^^
 >[, [primarySkillA, secondarySkillA]] : [undefined, [string, string]]
@@ -311,12 +311,12 @@ for ([, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++)
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -341,8 +341,8 @@ for ([, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++)
 >              : ^^^^^^
 }
 for ([, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
->[, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                                                  : ^^^^^^
+>[, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                                                  : ^
 >[, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[, [primarySkillA, secondarySkillA]] : [undefined, [string, string]]
@@ -357,20 +357,20 @@ for ([, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]],
 >                : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -396,8 +396,8 @@ for ([, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]],
 }
 
 for ([numberB] = robotA, i = 0; i < 1; i++) {
->[numberB] = robotA, i = 0 : number
->                          : ^^^^^^
+>[numberB] = robotA, i = 0 : 0
+>                          : ^
 >[numberB] = robotA : Robot
 >                   : ^^^^^
 >[numberB] : [number]
@@ -406,12 +406,12 @@ for ([numberB] = robotA, i = 0; i < 1; i++) {
 >        : ^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -436,8 +436,8 @@ for ([numberB] = robotA, i = 0; i < 1; i++) {
 >        : ^^^^^^
 }
 for ([numberB] = getRobot(), i = 0; i < 1; i++) {
->[numberB] = getRobot(), i = 0 : number
->                              : ^^^^^^
+>[numberB] = getRobot(), i = 0 : 0
+>                              : ^
 >[numberB] = getRobot() : Robot
 >                       : ^^^^^
 >[numberB] : [number]
@@ -448,12 +448,12 @@ for ([numberB] = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -478,8 +478,8 @@ for ([numberB] = getRobot(), i = 0; i < 1; i++) {
 >        : ^^^^^^
 }
 for ([numberB] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[numberB] = [2, "trimmer", "trimming"], i = 0 : number
->                                              : ^^^^^^
+>[numberB] = [2, "trimmer", "trimming"], i = 0 : 0
+>                                              : ^
 >[numberB] = [2, "trimmer", "trimming"] : [number, string, string]
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[numberB] : [number]
@@ -488,18 +488,18 @@ for ([numberB] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >        : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >"trimmer" : "trimmer"
 >          : ^^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -524,8 +524,8 @@ for ([numberB] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >        : ^^^^^^
 }
 for ([nameB] = multiRobotA, i = 0; i < 1; i++) {
->[nameB] = multiRobotA, i = 0 : number
->                             : ^^^^^^
+>[nameB] = multiRobotA, i = 0 : 0
+>                             : ^
 >[nameB] = multiRobotA : MultiSkilledRobot
 >                      : ^^^^^^^^^^^^^^^^^
 >[nameB] : [string]
@@ -534,12 +534,12 @@ for ([nameB] = multiRobotA, i = 0; i < 1; i++) {
 >      : ^^^^^^
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -564,8 +564,8 @@ for ([nameB] = multiRobotA, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([nameB] = getMultiRobot(), i = 0; i < 1; i++) {
->[nameB] = getMultiRobot(), i = 0 : number
->                                 : ^^^^^^
+>[nameB] = getMultiRobot(), i = 0 : 0
+>                                 : ^
 >[nameB] = getMultiRobot() : MultiSkilledRobot
 >                          : ^^^^^^^^^^^^^^^^^
 >[nameB] : [string]
@@ -576,12 +576,12 @@ for ([nameB] = getMultiRobot(), i = 0; i < 1; i++) {
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -606,8 +606,8 @@ for ([nameB] = getMultiRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([nameB] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
->[nameB] = ["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                     : ^^^^^^
+>[nameB] = ["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                     : ^
 >[nameB] = ["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                              : ^^^^^^^^^^^^^^^^^^
 >[nameB] : [string]
@@ -616,20 +616,20 @@ for ([nameB] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
 >      : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                    : ^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : string[]
 >                       : ^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
 >"edging" : "edging"
 >         : ^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -655,8 +655,8 @@ for ([nameB] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
 }
 
 for ([numberA2, nameA2, skillA2] = robotA, i = 0; i < 1; i++) {
->[numberA2, nameA2, skillA2] = robotA, i = 0 : number
->                                            : ^^^^^^
+>[numberA2, nameA2, skillA2] = robotA, i = 0 : 0
+>                                            : ^
 >[numberA2, nameA2, skillA2] = robotA : Robot
 >                                     : ^^^^^
 >[numberA2, nameA2, skillA2] : [number, string, string]
@@ -669,12 +669,12 @@ for ([numberA2, nameA2, skillA2] = robotA, i = 0; i < 1; i++) {
 >        : ^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -699,8 +699,8 @@ for ([numberA2, nameA2, skillA2] = robotA, i = 0; i < 1; i++) {
 >       : ^^^^^^
 }
 for ([numberA2, nameA2, skillA2] = getRobot(), i = 0; i < 1; i++) {
->[numberA2, nameA2, skillA2] = getRobot(), i = 0 : number
->                                                : ^^^^^^
+>[numberA2, nameA2, skillA2] = getRobot(), i = 0 : 0
+>                                                : ^
 >[numberA2, nameA2, skillA2] = getRobot() : Robot
 >                                         : ^^^^^
 >[numberA2, nameA2, skillA2] : [number, string, string]
@@ -715,12 +715,12 @@ for ([numberA2, nameA2, skillA2] = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -745,8 +745,8 @@ for ([numberA2, nameA2, skillA2] = getRobot(), i = 0; i < 1; i++) {
 >       : ^^^^^^
 }
 for ([numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0 : number
->                                                                : ^^^^^^
+>[numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0 : 0
+>                                                                : ^
 >[numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"] : [number, string, string]
 >                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[numberA2, nameA2, skillA2] : [number, string, string]
@@ -759,18 +759,18 @@ for ([numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0; i < 1; i++
 >        : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -795,8 +795,8 @@ for ([numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0; i < 1; i++
 >       : ^^^^^^
 }
 for ([nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) {
->[nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0 : number
->                                                                : ^^^^^^
+>[nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0 : 0
+>                                                                : ^
 >[nameMA, [primarySkillA, secondarySkillA]] = multiRobotA : MultiSkilledRobot
 >                                                         : ^^^^^^^^^^^^^^^^^
 >[nameMA, [primarySkillA, secondarySkillA]] : [string, [string, string]]
@@ -811,12 +811,12 @@ for ([nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++
 >                : ^^^^^^
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -841,8 +841,8 @@ for ([nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++
 >       : ^^^^^^
 }
 for ([nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) {
->[nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0 : number
->                                                                    : ^^^^^^
+>[nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0 : 0
+>                                                                    : ^
 >[nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot() : MultiSkilledRobot
 >                                                             : ^^^^^^^^^^^^^^^^^
 >[nameMA, [primarySkillA, secondarySkillA]] : [string, [string, string]]
@@ -859,12 +859,12 @@ for ([nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1;
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -889,8 +889,8 @@ for ([nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1;
 >       : ^^^^^^
 }
 for ([nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
->[nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                                                        : ^^^^^^
+>[nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                                                        : ^
 >[nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[nameMA, [primarySkillA, secondarySkillA]] : [string, [string, string]]
@@ -905,20 +905,20 @@ for ([nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edgi
 >                : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -944,8 +944,8 @@ for ([nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edgi
 }
 
 for ([numberA3, ...robotAInfo] = robotA, i = 0; i < 1; i++) {
->[numberA3, ...robotAInfo] = robotA, i = 0 : number
->                                          : ^^^^^^
+>[numberA3, ...robotAInfo] = robotA, i = 0 : 0
+>                                          : ^
 >[numberA3, ...robotAInfo] = robotA : Robot
 >                                   : ^^^^^
 >[numberA3, ...robotAInfo] : [number, ...(string | number)[]]
@@ -958,12 +958,12 @@ for ([numberA3, ...robotAInfo] = robotA, i = 0; i < 1; i++) {
 >           : ^^^^^^^^^^^^^^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -988,8 +988,8 @@ for ([numberA3, ...robotAInfo] = robotA, i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ([numberA3, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) {
->[numberA3, ...robotAInfo] = getRobot(), i = 0 : number
->                                              : ^^^^^^
+>[numberA3, ...robotAInfo] = getRobot(), i = 0 : 0
+>                                              : ^
 >[numberA3, ...robotAInfo] = getRobot() : Robot
 >                                       : ^^^^^
 >[numberA3, ...robotAInfo] : [number, ...(string | number)[]]
@@ -1004,12 +1004,12 @@ for ([numberA3, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1034,8 +1034,8 @@ for ([numberA3, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ([numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0 : number
->                                                                     : ^^^^^^
+>[numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0 : 0
+>                                                                     : ^
 >[numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"] : Robot
 >                                                              : ^^^^^
 >[numberA3, ...robotAInfo] : [number, ...(string | number)[]]
@@ -1050,18 +1050,18 @@ for ([numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0; i < 1
 >                                  : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1086,8 +1086,8 @@ for ([numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0; i < 1
 >         : ^^^^^^
 }
 for ([...multiRobotAInfo] = multiRobotA, i = 0; i < 1; i++) {
->[...multiRobotAInfo] = multiRobotA, i = 0 : number
->                                          : ^^^^^^
+>[...multiRobotAInfo] = multiRobotA, i = 0 : 0
+>                                          : ^
 >[...multiRobotAInfo] = multiRobotA : MultiSkilledRobot
 >                                   : ^^^^^^^^^^^^^^^^^
 >[...multiRobotAInfo] : (string | [string, string])[]
@@ -1098,12 +1098,12 @@ for ([...multiRobotAInfo] = multiRobotA, i = 0; i < 1; i++) {
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1128,8 +1128,8 @@ for ([...multiRobotAInfo] = multiRobotA, i = 0; i < 1; i++) {
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
 for ([...multiRobotAInfo] = getMultiRobot(), i = 0; i < 1; i++) {
->[...multiRobotAInfo] = getMultiRobot(), i = 0 : number
->                                              : ^^^^^^
+>[...multiRobotAInfo] = getMultiRobot(), i = 0 : 0
+>                                              : ^
 >[...multiRobotAInfo] = getMultiRobot() : MultiSkilledRobot
 >                                       : ^^^^^^^^^^^^^^^^^
 >[...multiRobotAInfo] : (string | [string, string])[]
@@ -1142,12 +1142,12 @@ for ([...multiRobotAInfo] = getMultiRobot(), i = 0; i < 1; i++) {
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1172,8 +1172,8 @@ for ([...multiRobotAInfo] = getMultiRobot(), i = 0; i < 1; i++) {
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
 for ([...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
->[...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                                                     : ^^^^^^
+>[...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                                                     : ^
 >[...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]] : MultiSkilledRobot
 >                                                                              : ^^^^^^^^^^^^^^^^^
 >[...multiRobotAInfo] : (string | [string, string])[]
@@ -1186,20 +1186,20 @@ for ([...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"
 >                                                       : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types
index 87cb81566b1..e52ddba83cb 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types
@@ -23,12 +23,12 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function getRobot() {
 >getRobot : () => Robot
@@ -44,28 +44,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getMultiRobot() {
 >getMultiRobot : () => MultiSkilledRobot
@@ -113,28 +113,28 @@ let i: number;
 >  : ^^^^^^
 
 for ([, nameA = "name"] = robotA, i = 0; i < 1; i++) {
->[, nameA = "name"] = robotA, i = 0 : number
->                                   : ^^^^^^
+>[, nameA = "name"] = robotA, i = 0 : 0
+>                                   : ^
 >[, nameA = "name"] = robotA : Robot
 >                            : ^^^^^
 >[, nameA = "name"] : [undefined, string]
 >                   : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "name" : string
+>nameA = "name" : "name"
 >               : ^^^^^^
 >nameA : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -159,30 +159,30 @@ for ([, nameA = "name"] = robotA, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([, nameA = "name"] = getRobot(), i = 0; i < 1; i++) {
->[, nameA = "name"] = getRobot(), i = 0 : number
->                                       : ^^^^^^
+>[, nameA = "name"] = getRobot(), i = 0 : 0
+>                                       : ^
 >[, nameA = "name"] = getRobot() : Robot
 >                                : ^^^^^
 >[, nameA = "name"] : [undefined, string]
 >                   : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "name" : string
+>nameA = "name" : "name"
 >               : ^^^^^^
 >nameA : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >getRobot() : Robot
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -207,34 +207,34 @@ for ([, nameA = "name"] = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([, nameA = "name"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[, nameA = "name"] = [2, "trimmer", "trimming"], i = 0 : number
->                                                       : ^^^^^^
+>[, nameA = "name"] = [2, "trimmer", "trimming"], i = 0 : 0
+>                                                       : ^
 >[, nameA = "name"] = [2, "trimmer", "trimming"] : [number, string, string]
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[, nameA = "name"] : [undefined, string]
 >                   : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "name" : string
+>nameA = "name" : "name"
 >               : ^^^^^^
 >nameA : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -259,8 +259,8 @@ for ([, nameA = "name"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([, [
->[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = multiRobotA, i = 0 : number
->                                                                                                              : ^^^^^^
+>[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = multiRobotA, i = 0 : 0
+>                                                                                                              : ^
 >[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = multiRobotA : MultiSkilledRobot
 >                                                                                                       : ^^^^^^^^^^^^^^^^^
 >[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] : [undefined, [string, string]]
@@ -273,36 +273,36 @@ for ([, [
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["none", "none"]] = multiRobotA, i = 0; i < 1; i++) {
 >["none", "none"] : [string, string]
 >                 : ^^^^^^^^^^^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -327,8 +327,8 @@ for ([, [
 >              : ^^^^^^
 }
 for ([, [
->[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = getMultiRobot(), i = 0 : number
->                                                                                                                  : ^^^^^^
+>[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = getMultiRobot(), i = 0 : 0
+>                                                                                                                  : ^
 >[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = getMultiRobot() : MultiSkilledRobot
 >                                                                                                           : ^^^^^^^^^^^^^^^^^
 >[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] : [undefined, [string, string]]
@@ -341,38 +341,38 @@ for ([, [
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["none", "none"]] = getMultiRobot(), i = 0; i < 1; i++) {
 >["none", "none"] : [string, string]
 >                 : ^^^^^^^^^^^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >getMultiRobot() : MultiSkilledRobot
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -397,8 +397,8 @@ for ([, [
 >              : ^^^^^^
 }
 for ([, [
->[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                                                                                                      : ^^^^^^
+>[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                                                                                                      : ^
 >[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                                                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[, [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["none", "none"]] : [undefined, [string, string]]
@@ -411,44 +411,44 @@ for ([, [
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
 >["none", "none"] : [string, string]
 >                 : ^^^^^^^^^^^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -474,8 +474,8 @@ for ([, [
 }
 
 for ([numberB = -1] = robotA, i = 0; i < 1; i++) {
->[numberB = -1] = robotA, i = 0 : number
->                               : ^^^^^^
+>[numberB = -1] = robotA, i = 0 : 0
+>                               : ^
 >[numberB = -1] = robotA : Robot
 >                        : ^^^^^
 >[numberB = -1] : [number]
@@ -490,12 +490,12 @@ for ([numberB = -1] = robotA, i = 0; i < 1; i++) {
 >  : ^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -520,8 +520,8 @@ for ([numberB = -1] = robotA, i = 0; i < 1; i++) {
 >        : ^^^^^^
 }
 for ([numberB = -1] = getRobot(), i = 0; i < 1; i++) {
->[numberB = -1] = getRobot(), i = 0 : number
->                                   : ^^^^^^
+>[numberB = -1] = getRobot(), i = 0 : 0
+>                                   : ^
 >[numberB = -1] = getRobot() : Robot
 >                            : ^^^^^
 >[numberB = -1] : [number]
@@ -538,12 +538,12 @@ for ([numberB = -1] = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -568,8 +568,8 @@ for ([numberB = -1] = getRobot(), i = 0; i < 1; i++) {
 >        : ^^^^^^
 }
 for ([numberB = -1] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[numberB = -1] = [2, "trimmer", "trimming"], i = 0 : number
->                                                   : ^^^^^^
+>[numberB = -1] = [2, "trimmer", "trimming"], i = 0 : 0
+>                                                   : ^
 >[numberB = -1] = [2, "trimmer", "trimming"] : [number, string, string]
 >                                            : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[numberB = -1] : [number]
@@ -584,18 +584,18 @@ for ([numberB = -1] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >  : ^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >"trimmer" : "trimmer"
 >          : ^^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -620,26 +620,26 @@ for ([numberB = -1] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
 >        : ^^^^^^
 }
 for ([nameB = "name"] = multiRobotA, i = 0; i < 1; i++) {
->[nameB = "name"] = multiRobotA, i = 0 : number
->                                      : ^^^^^^
+>[nameB = "name"] = multiRobotA, i = 0 : 0
+>                                      : ^
 >[nameB = "name"] = multiRobotA : MultiSkilledRobot
 >                               : ^^^^^^^^^^^^^^^^^
 >[nameB = "name"] : [string]
 >                 : ^^^^^^^^
->nameB = "name" : string
+>nameB = "name" : "name"
 >               : ^^^^^^
 >nameB : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -664,28 +664,28 @@ for ([nameB = "name"] = multiRobotA, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([nameB = "name"] = getMultiRobot(), i = 0; i < 1; i++) {
->[nameB = "name"] = getMultiRobot(), i = 0 : number
->                                          : ^^^^^^
+>[nameB = "name"] = getMultiRobot(), i = 0 : 0
+>                                          : ^
 >[nameB = "name"] = getMultiRobot() : MultiSkilledRobot
 >                                   : ^^^^^^^^^^^^^^^^^
 >[nameB = "name"] : [string]
 >                 : ^^^^^^^^
->nameB = "name" : string
+>nameB = "name" : "name"
 >               : ^^^^^^
 >nameB : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >getMultiRobot() : MultiSkilledRobot
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -710,34 +710,34 @@ for ([nameB = "name"] = getMultiRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ([nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
->[nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                              : ^^^^^^
+>[nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                              : ^
 >[nameB = "name"] = ["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                                       : ^^^^^^^^^^^^^^^^^^
 >[nameB = "name"] : [string]
 >                 : ^^^^^^^^
->nameB = "name" : string
+>nameB = "name" : "name"
 >               : ^^^^^^
 >nameB : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                    : ^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : string[]
 >                       : ^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
 >"edging" : "edging"
 >         : ^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -763,8 +763,8 @@ for ([nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++)
 }
 
 for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0; i < 1; i++) {
->[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0 : number
->                                                                    : ^^^^^^
+>[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0 : 0
+>                                                                    : ^
 >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA : Robot
 >                                                             : ^^^^^
 >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] : [number, string, string]
@@ -777,26 +777,26 @@ for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0; i < 1;
 >   : ^^
 >1 : 1
 >  : ^
->nameA2 = "name" : string
+>nameA2 = "name" : "name"
 >                : ^^^^^^
 >nameA2 : string
 >       : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->skillA2 = "skill" : string
->                  : ^^^^^^
+>skillA2 = "skill" : "skill"
+>                  : ^^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -821,8 +821,8 @@ for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0; i < 1;
 >       : ^^^^^^
 }
 for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0; i < 1; i++) {
->[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0 : number
->                                                                        : ^^^^^^
+>[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0 : 0
+>                                                                        : ^
 >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot() : Robot
 >                                                                 : ^^^^^
 >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] : [number, string, string]
@@ -835,28 +835,28 @@ for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0; i
 >   : ^^
 >1 : 1
 >  : ^
->nameA2 = "name" : string
+>nameA2 = "name" : "name"
 >                : ^^^^^^
 >nameA2 : string
 >       : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->skillA2 = "skill" : string
->                  : ^^^^^^
+>skillA2 = "skill" : "skill"
+>                  : ^^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >getRobot() : Robot
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -881,8 +881,8 @@ for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0; i
 >       : ^^^^^^
 }
 for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0 : number
->                                                                                        : ^^^^^^
+>[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0 : 0
+>                                                                                        : ^
 >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"] : [number, string, string]
 >                                                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^
 >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] : [number, string, string]
@@ -895,32 +895,32 @@ for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimm
 >   : ^^
 >1 : 1
 >  : ^
->nameA2 = "name" : string
+>nameA2 = "name" : "name"
 >                : ^^^^^^
 >nameA2 : string
 >       : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->skillA2 = "skill" : string
->                  : ^^^^^^
+>skillA2 = "skill" : "skill"
+>                  : ^^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -948,8 +948,8 @@ for (let
     [nameMA = "noName",
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
         [
             primarySkillA = "primary",
@@ -967,9 +967,9 @@ for (let
         ] = ["none", "none"]
 >["none", "none"] : [string, string]
 >                 : ^^^^^^^^^^^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     ] = multiRobotA, i = 0; i < 1; i++) {
@@ -1003,18 +1003,18 @@ for (let
 >       : ^^^^^^
 }
 for ([nameMA = "noName",
->[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] = getMultiRobot(), i = 0 : number
->                                                                                                                                                  : ^^^^^^
+>[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] = getMultiRobot(), i = 0 : 0
+>                                                                                                                                                  : ^
 >[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] = getMultiRobot() : MultiSkilledRobot
 >                                                                                                                                           : ^^^^^^^^^^^^^^^^^
 >[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] : [string, [string, string]]
 >                                                                                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->nameMA = "noName" : string
->                  : ^^^^^^
+>nameMA = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     [
 >[        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"] : [string, string]
@@ -1023,27 +1023,27 @@ for ([nameMA = "noName",
 >                                                                              : ^^^^^^^^^^^^^^^^
 
         primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     ] = ["none", "none"]
 >["none", "none"] : [string, string]
 >                 : ^^^^^^^^^^^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 ] = getMultiRobot(), i = 0; i < 1; i++) {
@@ -1051,12 +1051,12 @@ for ([nameMA = "noName",
 >                : ^^^^^^^^^^^^^^^^^
 >getMultiRobot : () => MultiSkilledRobot
 >              : ^^^^^^^^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1081,18 +1081,18 @@ for ([nameMA = "noName",
 >       : ^^^^^^
 }
 for ([nameMA = "noName",
->[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], i = 0 : number
->                                                                                                                                                                      : ^^^^^^
+>[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], i = 0 : 0
+>                                                                                                                                                                      : ^
 >[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                                                                                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[nameMA = "noName",    [        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"]] : [string, [string, string]]
 >                                                                                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->nameMA = "noName" : string
->                  : ^^^^^^
+>nameMA = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     [
 >[        primarySkillA = "primary",        secondarySkillA = "secondary"    ] = ["none", "none"] : [string, string]
@@ -1101,46 +1101,46 @@ for ([nameMA = "noName",
 >                                                                              : ^^^^^^^^^^^^^^^^
 
         primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     ] = ["none", "none"]
 >["none", "none"] : [string, string]
 >                 : ^^^^^^^^^^^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 ] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) {
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1166,8 +1166,8 @@ for ([nameMA = "noName",
 }
 
 for ([numberA3 = -1, ...robotAInfo] = robotA, i = 0; i < 1; i++) {
->[numberA3 = -1, ...robotAInfo] = robotA, i = 0 : number
->                                               : ^^^^^^
+>[numberA3 = -1, ...robotAInfo] = robotA, i = 0 : 0
+>                                               : ^
 >[numberA3 = -1, ...robotAInfo] = robotA : Robot
 >                                        : ^^^^^
 >[numberA3 = -1, ...robotAInfo] : [number, ...(string | number)[]]
@@ -1186,12 +1186,12 @@ for ([numberA3 = -1, ...robotAInfo] = robotA, i = 0; i < 1; i++) {
 >           : ^^^^^^^^^^^^^^^^^^^
 >robotA : Robot
 >       : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1216,8 +1216,8 @@ for ([numberA3 = -1, ...robotAInfo] = robotA, i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ([numberA3 = -1, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) {
->[numberA3 = -1, ...robotAInfo] = getRobot(), i = 0 : number
->                                                   : ^^^^^^
+>[numberA3 = -1, ...robotAInfo] = getRobot(), i = 0 : 0
+>                                                   : ^
 >[numberA3 = -1, ...robotAInfo] = getRobot() : Robot
 >                                            : ^^^^^
 >[numberA3 = -1, ...robotAInfo] : [number, ...(string | number)[]]
@@ -1238,12 +1238,12 @@ for ([numberA3 = -1, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1268,8 +1268,8 @@ for ([numberA3 = -1, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ([numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0; i < 1; i++) {
->[numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0 : number
->                                                                          : ^^^^^^
+>[numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0 : 0
+>                                                                          : ^
 >[numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"] : Robot
 >                                                                   : ^^^^^
 >[numberA3 = -1, ...robotAInfo] : [number, ...(string | number)[]]
@@ -1290,18 +1290,18 @@ for ([numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0;
 >                                  : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types
index 82a918daaa3..e84e013a836 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types
@@ -47,12 +47,12 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
@@ -61,19 +61,19 @@ let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secon
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 function getRobot() {
@@ -174,12 +174,12 @@ for (let {name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0;
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >i : number
 >  : ^^^^^^
 >0 : 0
@@ -308,20 +308,20 @@ for (let { skills: { primary: primaryA, secondary: secondaryA } } =
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
 >i : number
@@ -445,12 +445,12 @@ for (let {name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimm
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >i : number
 >  : ^^^^^^
 >0 : 0
@@ -591,20 +591,20 @@ for (let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
 >i : number
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types
index 4ff70e120fb..60343ca9b84 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types
@@ -47,12 +47,12 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
@@ -61,19 +61,19 @@ let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secon
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 function getRobot() {
@@ -116,8 +116,8 @@ let name: string, primary: string, secondary: string, skill: string;
 >      : ^^^^^^
 
 for ({ name: nameA } = robot, i = 0; i < 1; i++) {
->{ name: nameA } = robot, i = 0 : number
->                               : ^^^^^^
+>{ name: nameA } = robot, i = 0 : 0
+>                               : ^
 >{ name: nameA } = robot : Robot
 >                        : ^^^^^
 >{ name: nameA } : { name: string; }
@@ -128,12 +128,12 @@ for ({ name: nameA } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -158,8 +158,8 @@ for ({ name: nameA } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name: nameA } = getRobot(), i = 0; i < 1; i++) {
->{ name: nameA } = getRobot(), i = 0 : number
->                                    : ^^^^^^
+>{ name: nameA } = getRobot(), i = 0 : 0
+>                                    : ^
 >{ name: nameA } = getRobot() : Robot
 >                             : ^^^^^
 >{ name: nameA } : { name: string; }
@@ -172,12 +172,12 @@ for ({ name: nameA } = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -202,8 +202,8 @@ for ({ name: nameA } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                       : ^^^^^^
+>{ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                       : ^
 >{ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                : ^^^^^
 >{ name: nameA } : { name: string; }
@@ -218,18 +218,18 @@ for ({ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -254,8 +254,8 @@ for ({ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >      : ^^^^^^
 }
 for ({ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0; i < 1; i++) {
->{ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0 : number
->                                                                             : ^^^^^^
+>{ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0 : 0
+>                                                                             : ^
 >{ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot : MultiRobot
 >                                                                      : ^^^^^^^^^^
 >{ skills: { primary: primaryA, secondary: secondaryA } } : { skills: { primary: string; secondary: string; }; }
@@ -274,12 +274,12 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i =
 >           : ^^^^^^
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -304,8 +304,8 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i =
 >         : ^^^^^^
 }
 for ({ skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(), i = 0; i < 1; i++) {
->{ skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(), i = 0 : number
->                                                                                  : ^^^^^^
+>{ skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(), i = 0 : 0
+>                                                                                  : ^
 >{ skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot() : MultiRobot
 >                                                                           : ^^^^^^^^^^
 >{ skills: { primary: primaryA, secondary: secondaryA } } : { skills: { primary: string; secondary: string; }; }
@@ -326,12 +326,12 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(),
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -356,8 +356,8 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(),
 >         : ^^^^^^
 }
 for ({ skills: { primary: primaryA, secondary: secondaryA } } =
->{ skills: { primary: primaryA, secondary: secondaryA } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                                              : ^^^^^^
+>{ skills: { primary: primaryA, secondary: secondaryA } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                                              : ^
 >{ skills: { primary: primaryA, secondary: secondaryA } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                                    : ^^^^^^^^^^
 >{ skills: { primary: primaryA, secondary: secondaryA } } : { skills: { primary: string; secondary: string; }; }
@@ -382,28 +382,28 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } =
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -428,8 +428,8 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } =
 >         : ^^^^^^
 }
 for ({ name } = robot, i = 0; i < 1; i++) {
->{ name } = robot, i = 0 : number
->                        : ^^^^^^
+>{ name } = robot, i = 0 : 0
+>                        : ^
 >{ name } = robot : Robot
 >                 : ^^^^^
 >{ name } : { name: string; }
@@ -438,12 +438,12 @@ for ({ name } = robot, i = 0; i < 1; i++) {
 >     : ^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -468,8 +468,8 @@ for ({ name } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name } = getRobot(), i = 0; i < 1; i++) {
->{ name } = getRobot(), i = 0 : number
->                             : ^^^^^^
+>{ name } = getRobot(), i = 0 : 0
+>                             : ^
 >{ name } = getRobot() : Robot
 >                      : ^^^^^
 >{ name } : { name: string; }
@@ -480,12 +480,12 @@ for ({ name } = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -510,8 +510,8 @@ for ({ name } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                : ^^^^^^
+>{ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                : ^
 >{ name } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                         : ^^^^^
 >{ name } : { name: string; }
@@ -524,18 +524,18 @@ for ({ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -560,8 +560,8 @@ for ({ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++
 >      : ^^^^^^
 }
 for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
->{ skills: { primary, secondary } } = multiRobot, i = 0 : number
->                                                       : ^^^^^^
+>{ skills: { primary, secondary } } = multiRobot, i = 0 : 0
+>                                                       : ^
 >{ skills: { primary, secondary } } = multiRobot : MultiRobot
 >                                                : ^^^^^^^^^^
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
@@ -576,12 +576,12 @@ for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
 >          : ^^^^^^
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -606,8 +606,8 @@ for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ({ skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i++) {
->{ skills: { primary, secondary } } = getMultiRobot(), i = 0 : number
->                                                            : ^^^^^^
+>{ skills: { primary, secondary } } = getMultiRobot(), i = 0 : 0
+>                                                            : ^
 >{ skills: { primary, secondary } } = getMultiRobot() : MultiRobot
 >                                                     : ^^^^^^^^^^
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
@@ -624,12 +624,12 @@ for ({ skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i++) {
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -654,8 +654,8 @@ for ({ skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ({ skills: { primary, secondary } } =
->{ skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                        : ^^^^^^
+>{ skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                        : ^
 >{ skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                              : ^^^^^^^^^^
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
@@ -676,28 +676,28 @@ for ({ skills: { primary, secondary } } =
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -724,8 +724,8 @@ for ({ skills: { primary, secondary } } =
 
 
 for ({ name: nameA, skill: skillA } = robot, i = 0; i < 1; i++) {
->{ name: nameA, skill: skillA } = robot, i = 0 : number
->                                              : ^^^^^^
+>{ name: nameA, skill: skillA } = robot, i = 0 : 0
+>                                              : ^
 >{ name: nameA, skill: skillA } = robot : Robot
 >                                       : ^^^^^
 >{ name: nameA, skill: skillA } : { name: string; skill: string; }
@@ -740,12 +740,12 @@ for ({ name: nameA, skill: skillA } = robot, i = 0; i < 1; i++) {
 >       : ^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -770,8 +770,8 @@ for ({ name: nameA, skill: skillA } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name: nameA, skill: skillA } = getRobot(), i = 0; i < 1; i++) {
->{ name: nameA, skill: skillA } = getRobot(), i = 0 : number
->                                                   : ^^^^^^
+>{ name: nameA, skill: skillA } = getRobot(), i = 0 : 0
+>                                                   : ^
 >{ name: nameA, skill: skillA } = getRobot() : Robot
 >                                            : ^^^^^
 >{ name: nameA, skill: skillA } : { name: string; skill: string; }
@@ -788,12 +788,12 @@ for ({ name: nameA, skill: skillA } = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -818,8 +818,8 @@ for ({ name: nameA, skill: skillA } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                                      : ^^^^^^
+>{ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                                      : ^
 >{ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                               : ^^^^^
 >{ name: nameA, skill: skillA } : { name: string; skill: string; }
@@ -838,18 +838,18 @@ for ({ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -874,8 +874,8 @@ for ({ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming
 >      : ^^^^^^
 }
 for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0; i < 1; i++) {
->{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0 : number
->                                                                                          : ^^^^^^
+>{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0 : 0
+>                                                                                          : ^
 >{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = multiRobot : MultiRobot
 >                                                                                   : ^^^^^^^^^^
 >{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } : { name: string; skills: { primary: string; secondary: string; }; }
@@ -898,12 +898,12 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = mul
 >           : ^^^^^^
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -928,8 +928,8 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = mul
 >         : ^^^^^^
 }
 for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(), i = 0; i < 1; i++) {
->{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(), i = 0 : number
->                                                                                               : ^^^^^^
+>{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot(), i = 0 : 0
+>                                                                                               : ^
 >{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot() : MultiRobot
 >                                                                                        : ^^^^^^^^^^
 >{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } : { name: string; skills: { primary: string; secondary: string; }; }
@@ -954,12 +954,12 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = get
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -984,8 +984,8 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = get
 >         : ^^^^^^
 }
 for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
->{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                                                           : ^^^^^^
+>{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                                                           : ^
 >{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                                                 : ^^^^^^^^^^
 >{ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } : { name: string; skills: { primary: string; secondary: string; }; }
@@ -1014,28 +1014,28 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1060,8 +1060,8 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
 >         : ^^^^^^
 }
 for ({ name, skill } = robot, i = 0; i < 1; i++) {
->{ name, skill } = robot, i = 0 : number
->                               : ^^^^^^
+>{ name, skill } = robot, i = 0 : 0
+>                               : ^
 >{ name, skill } = robot : Robot
 >                        : ^^^^^
 >{ name, skill } : { name: string; skill: string; }
@@ -1072,12 +1072,12 @@ for ({ name, skill } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1102,8 +1102,8 @@ for ({ name, skill } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name, skill } = getRobot(), i = 0; i < 1; i++) {
->{ name, skill } = getRobot(), i = 0 : number
->                                    : ^^^^^^
+>{ name, skill } = getRobot(), i = 0 : 0
+>                                    : ^
 >{ name, skill } = getRobot() : Robot
 >                             : ^^^^^
 >{ name, skill } : { name: string; skill: string; }
@@ -1116,12 +1116,12 @@ for ({ name, skill } = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1146,8 +1146,8 @@ for ({ name, skill } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                       : ^^^^^^
+>{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                       : ^
 >{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                : ^^^^^
 >{ name, skill } : { name: string; skill: string; }
@@ -1162,18 +1162,18 @@ for ({ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1198,8 +1198,8 @@ for ({ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >      : ^^^^^^
 }
 for ({ name, skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
->{ name, skills: { primary, secondary } } = multiRobot, i = 0 : number
->                                                             : ^^^^^^
+>{ name, skills: { primary, secondary } } = multiRobot, i = 0 : 0
+>                                                             : ^
 >{ name, skills: { primary, secondary } } = multiRobot : MultiRobot
 >                                                      : ^^^^^^^^^^
 >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
@@ -1216,12 +1216,12 @@ for ({ name, skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
 >          : ^^^^^^
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1246,8 +1246,8 @@ for ({ name, skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
 >         : ^^^^^^
 }
 for ({ name, skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i++) {
->{ name, skills: { primary, secondary } } = getMultiRobot(), i = 0 : number
->                                                                  : ^^^^^^
+>{ name, skills: { primary, secondary } } = getMultiRobot(), i = 0 : 0
+>                                                                  : ^
 >{ name, skills: { primary, secondary } } = getMultiRobot() : MultiRobot
 >                                                           : ^^^^^^^^^^
 >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
@@ -1266,12 +1266,12 @@ for ({ name, skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1296,8 +1296,8 @@ for ({ name, skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i
 >         : ^^^^^^
 }
 for ({ name, skills: { primary, secondary } } =
->{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                              : ^^^^^^
+>{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                              : ^
 >{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                    : ^^^^^^^^^^
 >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
@@ -1320,28 +1320,28 @@ for ({ name, skills: { primary, secondary } } =
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types
index 31d7b80596b..50bc0a49329 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types
@@ -47,12 +47,12 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
@@ -61,19 +61,19 @@ let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secon
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 function getRobot() {
@@ -98,8 +98,8 @@ for (let {name: nameA= "noName" } = robot, i = 0; i < 1; i++) {
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >robot : Robot
 >      : ^^^^^
 >i : number
@@ -134,8 +134,8 @@ for (let {name: nameA = "noName" } = getRobot(), i = 0; i < 1; i++) {
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >getRobot() : Robot
 >           : ^^^^^
 >getRobot : () => Robot
@@ -172,20 +172,20 @@ for (let {name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming"
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                              : ^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >i : number
 >  : ^^^^^^
 >0 : 0
@@ -223,27 +223,27 @@ for (let {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary: string; secondary: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = multiRobot, i = 0; i < 1; i++) {
@@ -286,27 +286,27 @@ for (let {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary: string; secondary: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = getMultiRobot(), i = 0; i < 1; i++) {
@@ -351,27 +351,27 @@ for (let {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary: string; secondary: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
@@ -381,20 +381,20 @@ for (let {
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
 >i : number
@@ -430,14 +430,14 @@ for (let {name: nameA = "noName", skill: skillA = "skill" } = robot, i = 0; i <
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : any
 >      : ^^^
 >skillA : string
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >robot : Robot
 >      : ^^^^^
 >i : number
@@ -472,14 +472,14 @@ for (let {name: nameA = "noName", skill: skillA = "skill" } = getRobot(), i = 0;
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : any
 >      : ^^^
 >skillA : string
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >getRobot() : Robot
 >           : ^^^^^
 >getRobot : () => Robot
@@ -516,26 +516,26 @@ for (let {name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "tr
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : any
 >      : ^^^
 >skillA : string
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                              : ^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >i : number
 >  : ^^^^^^
 >0 : 0
@@ -569,8 +569,8 @@ for (let {
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : any
@@ -581,27 +581,27 @@ for (let {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary: string; secondary: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = multiRobot, i = 0; i < 1; i++) {
@@ -640,8 +640,8 @@ for (let {
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : any
@@ -652,27 +652,27 @@ for (let {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary: string; secondary: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = getMultiRobot(), i = 0; i < 1; i++) {
@@ -713,8 +713,8 @@ for (let {
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : any
@@ -725,27 +725,27 @@ for (let {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary: string; secondary: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
@@ -755,20 +755,20 @@ for (let {
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
 >i : number
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
index 6dd391a69cb..edf8bb79fa7 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
@@ -47,12 +47,12 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
@@ -61,19 +61,19 @@ let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secon
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 function getRobot() {
@@ -116,28 +116,28 @@ let name: string, primary: string, secondary: string, skill: string;
 >      : ^^^^^^
 
 for ({name: nameA = "noName" } = robot, i = 0; i < 1; i++) {
->{name: nameA = "noName" } = robot, i = 0 : number
->                                         : ^^^^^^
+>{name: nameA = "noName" } = robot, i = 0 : 0
+>                                         : ^
 >{name: nameA = "noName" } = robot : Robot
 >                                  : ^^^^^
 >{name: nameA = "noName" } : { name?: string; }
 >                          : ^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -162,30 +162,30 @@ for ({name: nameA = "noName" } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({name: nameA = "noName" } = getRobot(), i = 0; i < 1; i++) {
->{name: nameA = "noName" } = getRobot(), i = 0 : number
->                                              : ^^^^^^
+>{name: nameA = "noName" } = getRobot(), i = 0 : 0
+>                                              : ^
 >{name: nameA = "noName" } = getRobot() : Robot
 >                                       : ^^^^^
 >{name: nameA = "noName" } : { name?: string; }
 >                          : ^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >getRobot() : Robot
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -210,38 +210,38 @@ for ({name: nameA = "noName" } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                                 : ^^^^^^
+>{name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                                 : ^
 >{name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                          : ^^^^^
 >{name: nameA = "noName" } : { name?: string; }
 >                          : ^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                              : ^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -266,8 +266,8 @@ for ({name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" },
 >      : ^^^^^^
 }
 for ({
->{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : number
->                                                                                                                                                                   : ^^^^^^
+>{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : 0
+>                                                                                                                                                                   : ^
 >{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot : MultiRobot
 >                                                                                                                                                            : ^^^^^^^^^^
 >{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} : { skills?: { primary?: string; secondary?: string; }; }
@@ -284,44 +284,44 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary?: string; secondary?: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = multiRobot, i = 0; i < 1; i++) {
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -346,8 +346,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : number
->                                                                                                                                                                        : ^^^^^^
+>{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : 0
+>                                                                                                                                                                        : ^
 >{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot() : MultiRobot
 >                                                                                                                                                                 : ^^^^^^^^^^
 >{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} : { skills?: { primary?: string; secondary?: string; }; }
@@ -364,33 +364,33 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary?: string; secondary?: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = getMultiRobot(), i = 0; i < 1; i++) {
@@ -398,12 +398,12 @@ for ({
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -428,8 +428,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                                                                                                                                 : ^^^^^^
+>{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                                                                                                                                 : ^
 >{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                                                                                                                       : ^^^^^^^^^^
 >{    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} : { skills?: { primary?: string; secondary?: string; }; }
@@ -446,33 +446,33 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary?: string; secondary?: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
@@ -482,28 +482,28 @@ for ({
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -529,8 +529,8 @@ for ({
 }
 
 for ({ name = "noName" } = robot, i = 0; i < 1; i++) {
->{ name = "noName" } = robot, i = 0 : number
->                                   : ^^^^^^
+>{ name = "noName" } = robot, i = 0 : 0
+>                                   : ^
 >{ name = "noName" } = robot : Robot
 >                            : ^^^^^
 >{ name = "noName" } : { name?: string; }
@@ -541,12 +541,12 @@ for ({ name = "noName" } = robot, i = 0; i < 1; i++) {
 >         : ^^^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -571,8 +571,8 @@ for ({ name = "noName" } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name = "noName" } = getRobot(), i = 0; i < 1; i++) {
->{ name = "noName" } = getRobot(), i = 0 : number
->                                        : ^^^^^^
+>{ name = "noName" } = getRobot(), i = 0 : 0
+>                                        : ^
 >{ name = "noName" } = getRobot() : Robot
 >                                 : ^^^^^
 >{ name = "noName" } : { name?: string; }
@@ -585,12 +585,12 @@ for ({ name = "noName" } = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -615,8 +615,8 @@ for ({ name = "noName" } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                           : ^^^^^^
+>{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                           : ^
 >{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                    : ^^^^^
 >{ name = "noName" } : { name?: string; }
@@ -631,18 +631,18 @@ for ({ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0;
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -667,8 +667,8 @@ for ({ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0;
 >      : ^^^^^^
 }
 for ({
->{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : number
->                                                                                                                                             : ^^^^^^
+>{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : 0
+>                                                                                                                                             : ^
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot : MultiRobot
 >                                                                                                                                      : ^^^^^^^^^^
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { skills?: { primary?: string; secondary?: string; }; }
@@ -699,22 +699,22 @@ for ({
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = multiRobot, i = 0; i < 1; i++) {
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -739,8 +739,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : number
->                                                                                                                                                  : ^^^^^^
+>{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : 0
+>                                                                                                                                                  : ^
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot() : MultiRobot
 >                                                                                                                                           : ^^^^^^^^^^
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { skills?: { primary?: string; secondary?: string; }; }
@@ -771,11 +771,11 @@ for ({
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = getMultiRobot(), i = 0; i < 1; i++) {
@@ -783,12 +783,12 @@ for ({
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -813,8 +813,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                                                                                                           : ^^^^^^
+>{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                                                                                                           : ^
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                                                                                                 : ^^^^^^^^^^
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { skills?: { primary?: string; secondary?: string; }; }
@@ -845,11 +845,11 @@ for ({
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
@@ -859,28 +859,28 @@ for ({
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -907,36 +907,36 @@ for ({
 
 
 for ({name: nameA = "noName", skill: skillA = "skill" } = robot, i = 0; i < 1; i++) {
->{name: nameA = "noName", skill: skillA = "skill" } = robot, i = 0 : number
->                                                                  : ^^^^^^
+>{name: nameA = "noName", skill: skillA = "skill" } = robot, i = 0 : 0
+>                                                                  : ^
 >{name: nameA = "noName", skill: skillA = "skill" } = robot : Robot
 >                                                           : ^^^^^
 >{name: nameA = "noName", skill: skillA = "skill" } : { name?: string; skill?: string; }
 >                                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : string
 >      : ^^^^^^
->skillA = "skill" : string
->                 : ^^^^^^
+>skillA = "skill" : "skill"
+>                 : ^^^^^^^
 >skillA : string
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -961,38 +961,38 @@ for ({name: nameA = "noName", skill: skillA = "skill" } = robot, i = 0; i < 1; i
 >      : ^^^^^^
 }
 for ({name: nameA = "noName", skill: skillA = "skill" } = getRobot(), i = 0; i < 1; i++) {
->{name: nameA = "noName", skill: skillA = "skill" } = getRobot(), i = 0 : number
->                                                                       : ^^^^^^
+>{name: nameA = "noName", skill: skillA = "skill" } = getRobot(), i = 0 : 0
+>                                                                       : ^
 >{name: nameA = "noName", skill: skillA = "skill" } = getRobot() : Robot
 >                                                                : ^^^^^
 >{name: nameA = "noName", skill: skillA = "skill" } : { name?: string; skill?: string; }
 >                                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : string
 >      : ^^^^^^
->skillA = "skill" : string
->                 : ^^^^^^
+>skillA = "skill" : "skill"
+>                 : ^^^^^^^
 >skillA : string
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >getRobot() : Robot
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1017,46 +1017,46 @@ for ({name: nameA = "noName", skill: skillA = "skill" } = getRobot(), i = 0; i <
 >      : ^^^^^^
 }
 for ({name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                                                          : ^^^^^^
+>{name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                                                          : ^
 >{name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                                                   : ^^^^^
 >{name: nameA = "noName", skill: skillA = "skill" } : { name?: string; skill?: string; }
 >                                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : string
 >      : ^^^^^^
->skillA = "skill" : string
->                 : ^^^^^^
+>skillA = "skill" : "skill"
+>                 : ^^^^^^^
 >skillA : string
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                              : ^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1081,8 +1081,8 @@ for ({name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimme
 >      : ^^^^^^
 }
 for ({
->{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : number
->                                                                                                                                                                                              : ^^^^^^
+>{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : 0
+>                                                                                                                                                                                              : ^
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot : MultiRobot
 >                                                                                                                                                                                       : ^^^^^^^^^^
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
@@ -1091,12 +1091,12 @@ for ({
     name: nameA = "noName",
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : { primary?: string; secondary?: string; }
@@ -1109,44 +1109,44 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary?: string; secondary?: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = multiRobot, i = 0; i < 1; i++) {
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1171,8 +1171,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : number
->                                                                                                                                                                                                   : ^^^^^^
+>{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : 0
+>                                                                                                                                                                                                   : ^
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot() : MultiRobot
 >                                                                                                                                                                                            : ^^^^^^^^^^
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
@@ -1181,12 +1181,12 @@ for ({
     name: nameA = "noName",
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : { primary?: string; secondary?: string; }
@@ -1199,33 +1199,33 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary?: string; secondary?: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = getMultiRobot(), i = 0; i < 1; i++) {
@@ -1233,12 +1233,12 @@ for ({
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1263,8 +1263,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                                                                                                                                                            : ^^^^^^
+>{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                                                                                                                                                            : ^
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                                                                                                                                                  : ^^^^^^^^^^
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
@@ -1273,12 +1273,12 @@ for ({
     name: nameA = "noName",
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : { primary?: string; secondary?: string; }
@@ -1291,33 +1291,33 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "none", secondary: "none" }
 >{ primary: "none", secondary: "none" } : { primary?: string; secondary?: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
@@ -1327,28 +1327,28 @@ for ({
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1374,8 +1374,8 @@ for ({
 }
 
 for ({ name = "noName", skill = "skill" } = robot, i = 0; i < 1; i++) {
->{ name = "noName", skill = "skill" } = robot, i = 0 : number
->                                                    : ^^^^^^
+>{ name = "noName", skill = "skill" } = robot, i = 0 : 0
+>                                                    : ^
 >{ name = "noName", skill = "skill" } = robot : Robot
 >                                             : ^^^^^
 >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
@@ -1390,12 +1390,12 @@ for ({ name = "noName", skill = "skill" } = robot, i = 0; i < 1; i++) {
 >        : ^^^^^^^
 >robot : Robot
 >      : ^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1420,8 +1420,8 @@ for ({ name = "noName", skill = "skill" } = robot, i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name = "noName", skill = "skill" } = getRobot(), i = 0; i < 1; i++) {
->{ name = "noName", skill = "skill" } = getRobot(), i = 0 : number
->                                                         : ^^^^^^
+>{ name = "noName", skill = "skill" } = getRobot(), i = 0 : 0
+>                                                         : ^
 >{ name = "noName", skill = "skill" } = getRobot() : Robot
 >                                                  : ^^^^^
 >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
@@ -1438,12 +1438,12 @@ for ({ name = "noName", skill = "skill" } = getRobot(), i = 0; i < 1; i++) {
 >           : ^^^^^
 >getRobot : () => Robot
 >         : ^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1468,8 +1468,8 @@ for ({ name = "noName", skill = "skill" } = getRobot(), i = 0; i < 1; i++) {
 >      : ^^^^^^
 }
 for ({ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++) {
->{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : number
->                                                                                            : ^^^^^^
+>{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
+>                                                                                            : ^
 >{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >                                                                                     : ^^^^^
 >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
@@ -1488,18 +1488,18 @@ for ({ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "tr
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1524,8 +1524,8 @@ for ({ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "tr
 >      : ^^^^^^
 }
 for ({
->{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : number
->                                                                                                                                                                 : ^^^^^^
+>{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot, i = 0 : 0
+>                                                                                                                                                                 : ^
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = multiRobot : MultiRobot
 >                                                                                                                                                          : ^^^^^^^^^^
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
@@ -1562,22 +1562,22 @@ for ({
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = multiRobot, i = 0; i < 1; i++) {
 >multiRobot : MultiRobot
 >           : ^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1602,8 +1602,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : number
->                                                                                                                                                                      : ^^^^^^
+>{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot(), i = 0 : 0
+>                                                                                                                                                                      : ^
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = getMultiRobot() : MultiRobot
 >                                                                                                                                                               : ^^^^^^^^^^
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
@@ -1640,11 +1640,11 @@ for ({
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = getMultiRobot(), i = 0; i < 1; i++) {
@@ -1652,12 +1652,12 @@ for ({
 >                : ^^^^^^^^^^
 >getMultiRobot : () => MultiRobot
 >              : ^^^^^^^^^^^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
@@ -1682,8 +1682,8 @@ for ({
 >         : ^^^^^^
 }
 for ({
->{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : number
->                                                                                                                                                                                                                                               : ^^^^^^
+>{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
+>                                                                                                                                                                                                                                               : ^
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >                                                                                                                                                                                                                                     : ^^^^^^^^^^
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
@@ -1720,11 +1720,11 @@ for ({
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
@@ -1734,28 +1734,28 @@ for ({
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     i = 0; i < 1; i++) {
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 1 : boolean
 >      : ^^^^^^^
 >i : number
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types
index 6834826b91f..cca716efa54 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types
@@ -23,24 +23,24 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let robots = [robotA, robotB];
 >robots : Robot[]
@@ -66,28 +66,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let multiRobots = [multiRobotA, multiRobotB];
 >multiRobots : MultiSkilledRobot[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types
index ab6a531b6fd..8cfff566e87 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types
@@ -23,24 +23,24 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let robots = [robotA, robotB];
 >robots : Robot[]
@@ -66,28 +66,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let multiRobots = [multiRobotA, multiRobotB];
 >multiRobots : MultiSkilledRobot[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types
index 2a09ee4a708..c932fd489b8 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types
@@ -23,24 +23,24 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let robots = [robotA, robotB];
 >robots : Robot[]
@@ -66,28 +66,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let multiRobots = [multiRobotA, multiRobotB];
 >multiRobots : MultiSkilledRobot[]
@@ -199,10 +199,10 @@ for (let [, [
 ] = ["skill1", "skill2"]] of multiRobots) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >multiRobots : MultiSkilledRobot[]
 >            : ^^^^^^^^^^^^^^^^^^^
 
@@ -237,10 +237,10 @@ for (let [, [
 ] = ["skill1", "skill2"]] of getMultiRobots()) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >getMultiRobots() : MultiSkilledRobot[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >getMultiRobots : () => MultiSkilledRobot[]
@@ -277,10 +277,10 @@ for (let [, [
 ] = ["skill1", "skill2"]] of [multiRobotA, multiRobotB]) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >[multiRobotA, multiRobotB] : MultiSkilledRobot[]
 >                           : ^^^^^^^^^^^^^^^^^^^
 >multiRobotA : MultiSkilledRobot
@@ -557,10 +557,10 @@ for (let [nameMA = "noName", [
 ] = ["skill1", "skill2"]] of multiRobots) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >multiRobots : MultiSkilledRobot[]
 >            : ^^^^^^^^^^^^^^^^^^^
 
@@ -597,10 +597,10 @@ for (let [nameMA = "noName", [
 ] = ["skill1", "skill2"]] of getMultiRobots()) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >getMultiRobots() : MultiSkilledRobot[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >getMultiRobots : () => MultiSkilledRobot[]
@@ -639,10 +639,10 @@ for (let [nameMA = "noName", [
 ] = ["skill1", "skill2"]] of [multiRobotA, multiRobotB]) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >[multiRobotA, multiRobotB] : MultiSkilledRobot[]
 >                           : ^^^^^^^^^^^^^^^^^^^
 >multiRobotA : MultiSkilledRobot
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types
index c4c53e1d45c..0659af5e1a0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types
@@ -23,24 +23,24 @@ let robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let robots = [robotA, robotB];
 >robots : Robot[]
@@ -66,28 +66,28 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let multiRobots = [multiRobotA, multiRobotB];
 >multiRobots : MultiSkilledRobot[]
@@ -145,12 +145,12 @@ for ([, nameA = "noName"] of robots) {
 >                     : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >robots : Robot[]
 >       : ^^^^^^^
 
@@ -171,12 +171,12 @@ for ([, nameA = "noName"] of getRobots()) {
 >                     : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >getRobots() : Robot[]
 >            : ^^^^^^^
 >getRobots : () => Robot[]
@@ -199,12 +199,12 @@ for ([, nameA = "noName"] of [robotA, robotB]) {
 >                     : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[robotA, robotB] : Robot[]
 >                 : ^^^^^^^
 >robotA : Robot
@@ -235,28 +235,28 @@ for ([, [
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["skill1", "skill2"]] of multiRobots) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >multiRobots : MultiSkilledRobot[]
 >            : ^^^^^^^^^^^^^^^^^^^
 
@@ -283,28 +283,28 @@ for ([, [
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["skill1", "skill2"]] of getMultiRobots()) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >getMultiRobots() : MultiSkilledRobot[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >getMultiRobots : () => MultiSkilledRobot[]
@@ -333,28 +333,28 @@ for ([, [
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["skill1", "skill2"]] of [multiRobotA, multiRobotB]) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >[multiRobotA, multiRobotB] : MultiSkilledRobot[]
 >                           : ^^^^^^^^^^^^^^^^^^^
 >multiRobotA : MultiSkilledRobot
@@ -462,12 +462,12 @@ for ([numberB = -1] of [robotA, robotB]) {
 for ([nameB = "noName"] of multiRobots) {
 >[nameB = "noName"] : [string]
 >                   : ^^^^^^^^
->nameB = "noName" : string
->                 : ^^^^^^
+>nameB = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >multiRobots : MultiSkilledRobot[]
 >            : ^^^^^^^^^^^^^^^^^^^
 
@@ -486,12 +486,12 @@ for ([nameB = "noName"] of multiRobots) {
 for ([nameB = "noName"] of getMultiRobots()) {
 >[nameB = "noName"] : [string]
 >                   : ^^^^^^^^
->nameB = "noName" : string
->                 : ^^^^^^
+>nameB = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >getMultiRobots() : MultiSkilledRobot[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >getMultiRobots : () => MultiSkilledRobot[]
@@ -512,12 +512,12 @@ for ([nameB = "noName"] of getMultiRobots()) {
 for ([nameB = "noName"] of [multiRobotA, multiRobotB]) {
 >[nameB = "noName"] : [string]
 >                   : ^^^^^^^^
->nameB = "noName" : string
->                 : ^^^^^^
+>nameB = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[multiRobotA, multiRobotB] : MultiSkilledRobot[]
 >                           : ^^^^^^^^^^^^^^^^^^^
 >multiRobotA : MultiSkilledRobot
@@ -549,18 +549,18 @@ for ([numberA2 = -1, nameA2 = "noName", skillA2 = "skill"] of robots) {
 >   : ^^
 >1 : 1
 >  : ^
->nameA2 = "noName" : string
->                  : ^^^^^^
+>nameA2 = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameA2 : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
->skillA2 = "skill" : string
->                  : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
+>skillA2 = "skill" : "skill"
+>                  : ^^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >robots : Robot[]
 >       : ^^^^^^^
 
@@ -587,18 +587,18 @@ for ([numberA2 = -1, nameA2 = "noName", skillA2 = "skill"] of getRobots()) {
 >   : ^^
 >1 : 1
 >  : ^
->nameA2 = "noName" : string
->                  : ^^^^^^
+>nameA2 = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameA2 : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
->skillA2 = "skill" : string
->                  : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
+>skillA2 = "skill" : "skill"
+>                  : ^^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >getRobots() : Robot[]
 >            : ^^^^^^^
 >getRobots : () => Robot[]
@@ -627,18 +627,18 @@ for ([numberA2 = -1, nameA2 = "noName", skillA2 = "skill"] of [robotA, robotB])
 >   : ^^
 >1 : 1
 >  : ^
->nameA2 = "noName" : string
->                  : ^^^^^^
+>nameA2 = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameA2 : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
->skillA2 = "skill" : string
->                  : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
+>skillA2 = "skill" : "skill"
+>                  : ^^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >[robotA, robotB] : Robot[]
 >                 : ^^^^^^^
 >robotA : Robot
@@ -661,40 +661,40 @@ for ([numberA2 = -1, nameA2 = "noName", skillA2 = "skill"] of [robotA, robotB])
 for ([nameMA = "noName", [
 >[nameMA = "noName", [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["skill1", "skill2"]] : [string, [string, string]]
 >                                                                                                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->nameMA = "noName" : string
->                  : ^^^^^^
+>nameMA = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["skill1", "skill2"] : [string, string]
 >                                                                                         : ^^^^^^^^^^^^^^^^
 >[    primarySkillA = "primary",    secondarySkillA = "secondary"] : [string, string]
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["skill1", "skill2"]] of multiRobots) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >multiRobots : MultiSkilledRobot[]
 >            : ^^^^^^^^^^^^^^^^^^^
 
@@ -713,40 +713,40 @@ for ([nameMA = "noName", [
 for ([nameMA = "noName", [
 >[nameMA = "noName", [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["skill1", "skill2"]] : [string, [string, string]]
 >                                                                                                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->nameMA = "noName" : string
->                  : ^^^^^^
+>nameMA = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["skill1", "skill2"] : [string, string]
 >                                                                                         : ^^^^^^^^^^^^^^^^
 >[    primarySkillA = "primary",    secondarySkillA = "secondary"] : [string, string]
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["skill1", "skill2"]] of getMultiRobots()) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >getMultiRobots() : MultiSkilledRobot[]
 >                 : ^^^^^^^^^^^^^^^^^^^
 >getMultiRobots : () => MultiSkilledRobot[]
@@ -767,40 +767,40 @@ for ([nameMA = "noName", [
 for ([nameMA = "noName", [
 >[nameMA = "noName", [    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["skill1", "skill2"]] : [string, [string, string]]
 >                                                                                                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->nameMA = "noName" : string
->                  : ^^^^^^
+>nameMA = "noName" : "noName"
+>                  : ^^^^^^^^
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[    primarySkillA = "primary",    secondarySkillA = "secondary"] = ["skill1", "skill2"] : [string, string]
 >                                                                                         : ^^^^^^^^^^^^^^^^
 >[    primarySkillA = "primary",    secondarySkillA = "secondary"] : [string, string]
 >                                                                  : ^^^^^^^^^^^^^^^^
 
     primarySkillA = "primary",
->primarySkillA = "primary" : string
->                          : ^^^^^^
+>primarySkillA = "primary" : "primary"
+>                          : ^^^^^^^^^
 >primarySkillA : string
 >              : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
     secondarySkillA = "secondary"
->secondarySkillA = "secondary" : string
->                              : ^^^^^^
+>secondarySkillA = "secondary" : "secondary"
+>                              : ^^^^^^^^^^^
 >secondarySkillA : string
 >                : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
 ] = ["skill1", "skill2"]] of [multiRobotA, multiRobotB]) {
 >["skill1", "skill2"] : [string, string]
 >                     : ^^^^^^^^^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 >[multiRobotA, multiRobotB] : MultiSkilledRobot[]
 >                           : ^^^^^^^^^^^^^^^^^^^
 >multiRobotA : MultiSkilledRobot
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types
index 8ee8f2c2645..ed48a298e5b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types
@@ -49,22 +49,22 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
@@ -75,19 +75,19 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }];
@@ -95,20 +95,20 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getRobots() {
 >getRobots : () => Robot[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
index 4eb2f386b82..63c5d399ef3 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
@@ -49,22 +49,22 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
@@ -75,19 +75,19 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }];
@@ -95,20 +95,20 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getRobots() {
 >getRobots : () => Robot[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types
index b66c875f521..6b340234e28 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types
@@ -49,22 +49,22 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
@@ -75,19 +75,19 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }];
@@ -95,20 +95,20 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getRobots() {
 >getRobots : () => Robot[]
@@ -237,12 +237,12 @@ for (let { skills: { primary: primaryA = "primary", secondary: secondaryA = "sec
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"nosKill" : string
->          : ^^^^^^
+>"nosKill" : "nosKill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >multiRobots : MultiRobot[]
 >            : ^^^^^^^^^^^^
 
@@ -279,12 +279,12 @@ for (let { skills: { primary: primaryA = "primary", secondary: secondaryA = "sec
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"nosKill" : string
->          : ^^^^^^
+>"nosKill" : "nosKill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >getMultiRobots() : MultiRobot[]
 >                 : ^^^^^^^^^^^^
 >getMultiRobots : () => MultiRobot[]
@@ -323,12 +323,12 @@ for (let { skills: { primary: primaryA = "primary", secondary: secondaryA = "sec
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"nosKill" : string
->          : ^^^^^^
+>"nosKill" : "nosKill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
     <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 ><MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : MultiRobot[]
@@ -339,19 +339,19 @@ for (let { skills: { primary: primaryA = "primary", secondary: secondaryA = "sec
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]) {
@@ -359,20 +359,20 @@ for (let { skills: { primary: primaryA = "primary", secondary: secondaryA = "sec
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     console.log(primaryA);
 >console.log(primaryA) : void
@@ -527,12 +527,12 @@ for (let {
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of multiRobots) {
 >multiRobots : MultiRobot[]
@@ -584,12 +584,12 @@ for (let {
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of getMultiRobots()) {
 >getMultiRobots() : MultiRobot[]
@@ -643,12 +643,12 @@ for (let {
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 ><MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : MultiRobot[]
@@ -659,19 +659,19 @@ for (let {
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]) {
@@ -679,20 +679,20 @@ for (let {
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     console.log(nameA);
 >console.log(nameA) : void
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
index c1817570bf4..61071a5da11 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
@@ -49,22 +49,22 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
@@ -75,19 +75,19 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }];
@@ -95,20 +95,20 @@ let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", s
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function getRobots() {
 >getRobots : () => Robot[]
@@ -155,12 +155,12 @@ for ({name: nameA = "noName" } of robots) {
 >                          : ^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >robots : Robot[]
 >       : ^^^^^^^
 
@@ -181,12 +181,12 @@ for ({name: nameA = "noName" } of getRobots()) {
 >                          : ^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >getRobots() : Robot[]
 >            : ^^^^^^^
 >getRobots : () => Robot[]
@@ -209,12 +209,12 @@ for ({name: nameA = "noName" } of [{ name: "mower", skill: "mowing" }, { name: "
 >                          : ^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >                                                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
@@ -261,32 +261,32 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 >                                                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     { primary: "nosKill", secondary: "noSkill" } } of multiRobots) {
 >{ primary: "nosKill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"nosKill" : string
->          : ^^^^^^
+>"nosKill" : "nosKill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >multiRobots : MultiRobot[]
 >            : ^^^^^^^^^^^^
 
@@ -313,32 +313,32 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 >                                                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     { primary: "nosKill", secondary: "noSkill" } } of getMultiRobots()) {
 >{ primary: "nosKill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"nosKill" : string
->          : ^^^^^^
+>"nosKill" : "nosKill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >getMultiRobots() : MultiRobot[]
 >                 : ^^^^^^^^^^^^
 >getMultiRobots : () => MultiRobot[]
@@ -367,32 +367,32 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 >                                                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     { primary: "nosKill", secondary: "noSkill" } } of
 >{ primary: "nosKill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"nosKill" : string
->          : ^^^^^^
+>"nosKill" : "nosKill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
     <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 ><MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },        { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : MultiRobot[]
@@ -403,19 +403,19 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
         { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]) {
@@ -423,20 +423,20 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     console.log(primaryA);
 >console.log(primaryA) : void
@@ -568,12 +568,12 @@ for ({
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of multiRobots) {
 >multiRobots : MultiRobot[]
@@ -620,12 +620,12 @@ for ({
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of getMultiRobots()) {
 >getMultiRobots() : MultiRobot[]
@@ -674,12 +674,12 @@ for ({
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
@@ -742,20 +742,20 @@ for ({name: nameA = "noName", skill: skillA = "noSkill" } of robots) {
 >                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : string
 >      : ^^^^^^
->skillA = "noSkill" : string
->                   : ^^^^^^
+>skillA = "noSkill" : "noSkill"
+>                   : ^^^^^^^^^
 >skillA : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >robots : Robot[]
 >       : ^^^^^^^
 
@@ -776,20 +776,20 @@ for ({name: nameA = "noName", skill: skillA = "noSkill"  } of getRobots()) {
 >                                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : string
 >      : ^^^^^^
->skillA = "noSkill" : string
->                   : ^^^^^^
+>skillA = "noSkill" : "noSkill"
+>                   : ^^^^^^^^^
 >skillA : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >getRobots() : Robot[]
 >            : ^^^^^^^
 >getRobots : () => Robot[]
@@ -812,20 +812,20 @@ for ({name: nameA = "noName", skill: skillA = "noSkill"  } of [{ name: "mower",
 >                                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >skill : string
 >      : ^^^^^^
->skillA = "noSkill" : string
->                   : ^^^^^^
+>skillA = "noSkill" : "noSkill"
+>                   : ^^^^^^^^^
 >skillA : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >                                                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
@@ -868,12 +868,12 @@ for ({
     name: nameA = "noName",
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : { primary?: string; secondary?: string; }
@@ -886,34 +886,34 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "noSkill", secondary: "noSkill" }
 >{ primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of multiRobots) {
 >multiRobots : MultiRobot[]
@@ -938,12 +938,12 @@ for ({
     name: nameA = "noName",
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : { primary?: string; secondary?: string; }
@@ -956,34 +956,34 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "noSkill", secondary: "noSkill" }
 >{ primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of getMultiRobots()) {
 >getMultiRobots() : MultiRobot[]
@@ -1010,12 +1010,12 @@ for ({
     name: nameA = "noName",
 >name : string
 >     : ^^^^^^
->nameA = "noName" : string
->                 : ^^^^^^
+>nameA = "noName" : "noName"
+>                 : ^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     skills: {
 >skills : { primary?: string; secondary?: string; }
@@ -1028,34 +1028,34 @@ for ({
         primary: primaryA = "primary",
 >primary : string
 >        : ^^^^^^
->primaryA = "primary" : string
->                     : ^^^^^^
+>primaryA = "primary" : "primary"
+>                     : ^^^^^^^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "secondary"
 >secondary : string
 >          : ^^^^^^
->secondaryA = "secondary" : string
->                         : ^^^^^^
+>secondaryA = "secondary" : "secondary"
+>                         : ^^^^^^^^^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
     } = { primary: "noSkill", secondary: "noSkill" }
 >{ primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 ><MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : MultiRobot[]
@@ -1066,19 +1066,19 @@ for ({
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
     { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]) {
@@ -1086,20 +1086,20 @@ for ({
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
     console.log(nameA);
 >console.log(nameA) : void
@@ -1249,12 +1249,12 @@ for ({
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of multiRobots) {
 >multiRobots : MultiRobot[]
@@ -1307,12 +1307,12 @@ for ({
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of getMultiRobots()) {
 >getMultiRobots() : MultiRobot[]
@@ -1367,12 +1367,12 @@ for ({
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
index 6a04308e48f..978a8bccac0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
@@ -37,19 +37,19 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 function foo1({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) {
@@ -148,20 +148,20 @@ foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -180,20 +180,20 @@ foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -212,18 +212,18 @@ foo3({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
index a01111aa557..dc0af84bf16 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
@@ -37,19 +37,19 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 function foo1(
@@ -65,28 +65,28 @@ function foo1(
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
             secondary: secondaryA = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
         } = { primary: "SomeSkill", secondary: "someSkill" }
 >{ primary: "SomeSkill", secondary: "someSkill" } : { primary: string; secondary: string; }
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"SomeSkill" : string
->            : ^^^^^^
+>"SomeSkill" : "SomeSkill"
+>            : ^^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"someSkill" : string
->            : ^^^^^^
+>"someSkill" : "someSkill"
+>            : ^^^^^^^^^^^
 
     }: Robot = robotA) {
 >robotA : Robot
@@ -113,7 +113,7 @@ function foo2(
 >     : ^^^
 >nameC : string
 >      : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 
         skills: {
@@ -125,28 +125,28 @@ function foo2(
 >        : ^^^
 >primaryB : string
 >         : ^^^^^^
->"primary" : string
->          : ^^^^^^
+>"primary" : "primary"
+>          : ^^^^^^^^^
 
             secondary: secondaryB = "secondary"
 >secondary : any
 >          : ^^^
 >secondaryB : string
 >           : ^^^^^^
->"secondary" : string
->            : ^^^^^^
+>"secondary" : "secondary"
+>            : ^^^^^^^^^^^
 
         } = { primary: "SomeSkill", secondary: "someSkill" }
 >{ primary: "SomeSkill", secondary: "someSkill" } : { primary: string; secondary: string; }
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"SomeSkill" : string
->            : ^^^^^^
+>"SomeSkill" : "SomeSkill"
+>            : ^^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"someSkill" : string
->            : ^^^^^^
+>"someSkill" : "someSkill"
+>            : ^^^^^^^^^^^
 
     }: Robot = robotA) {
 >robotA : Robot
@@ -173,12 +173,12 @@ function foo3({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }: Ro
 >                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"SomeSkill" : string
->            : ^^^^^^
+>"SomeSkill" : "SomeSkill"
+>            : ^^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"someSkill" : string
->            : ^^^^^^
+>"someSkill" : "someSkill"
+>            : ^^^^^^^^^^^
 >robotA : Robot
 >       : ^^^^^
 
@@ -216,20 +216,20 @@ foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -248,20 +248,20 @@ foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -280,18 +280,18 @@ foo3({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
index a1c6958b409..9fdb7fcd7b0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
@@ -33,12 +33,12 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function foo1({ name: nameA }: Robot) {
 >foo1 : ({ name: nameA }: Robot) => void
@@ -120,12 +120,12 @@ foo1({ name: "Edger", skill: "cutting edges" });
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"cutting edges" : string
->                : ^^^^^^
+>"cutting edges" : "cutting edges"
+>                : ^^^^^^^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -144,12 +144,12 @@ foo2({ name: "Edger", skill: "cutting edges" });
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"cutting edges" : string
->                : ^^^^^^
+>"cutting edges" : "cutting edges"
+>                : ^^^^^^^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -168,10 +168,10 @@ foo3({ name: "Edger", skill: "cutting edges" });
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"cutting edges" : string
->                : ^^^^^^
+>"cutting edges" : "cutting edges"
+>                : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
index 28ac04800ad..935c9aecb94 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
@@ -33,12 +33,12 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function foo1({ name: nameA = "<NoName>" }: Robot = { }) {
 >foo1 : ({ name: nameA }?: Robot) => void
@@ -47,8 +47,8 @@ function foo1({ name: nameA = "<NoName>" }: Robot = { }) {
 >     : ^^^
 >nameA : string
 >      : ^^^^^^
->"<NoName>" : string
->           : ^^^^^^
+>"<NoName>" : "<NoName>"
+>           : ^^^^^^^^^^
 >{ } : {}
 >    : ^^
 
@@ -71,14 +71,14 @@ function foo2({ name: nameB = "<NoName>", skill: skillB = "noSkill" }: Robot = {
 >     : ^^^
 >nameB : string
 >      : ^^^^^^
->"<NoName>" : string
->           : ^^^^^^
+>"<NoName>" : "<NoName>"
+>           : ^^^^^^^^^^
 >skill : any
 >      : ^^^
 >skillB : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >{} : {}
 >   : ^^
 
@@ -99,8 +99,8 @@ function foo3({ name = "<NoName>" }: Robot = {}) {
 >     : ^        ^^^     ^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"<NoName>" : string
->           : ^^^^^^
+>"<NoName>" : "<NoName>"
+>           : ^^^^^^^^^^
 >{} : {}
 >   : ^^
 
@@ -134,12 +134,12 @@ foo1({ name: "Edger", skill: "cutting edges" });
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"cutting edges" : string
->                : ^^^^^^
+>"cutting edges" : "cutting edges"
+>                : ^^^^^^^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -158,12 +158,12 @@ foo2({ name: "Edger", skill: "cutting edges" });
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"cutting edges" : string
->                : ^^^^^^
+>"cutting edges" : "cutting edges"
+>                : ^^^^^^^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -182,10 +182,10 @@ foo3({ name: "Edger", skill: "cutting edges" });
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"cutting edges" : string
->                : ^^^^^^
+>"cutting edges" : "cutting edges"
+>                : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types
index 9a56861dab1..52edb6fd0a0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types
@@ -19,12 +19,12 @@ var robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function foo1([, nameA]: Robot) {
 >foo1 : ([, nameA]: Robot) => void
@@ -125,12 +125,12 @@ foo1([2, "trimmer", "trimming"]);
 >     : ^         ^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -147,12 +147,12 @@ foo2([2, "trimmer", "trimming"]);
 >     : ^         ^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -169,12 +169,12 @@ foo3([2, "trimmer", "trimming"]);
 >     : ^                           ^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 foo4(robotA);
 >foo4(robotA) : void
@@ -191,10 +191,10 @@ foo4([2, "trimmer", "trimming"]);
 >     : ^                         ^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types
index bab61d1b041..4de0b5be581 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types
@@ -19,14 +19,14 @@ var robotA: Robot = ["trimmer", ["trimming", "edging"]];
 >       : ^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function foo1([, skillA]: Robot) {
 >foo1 : ([, skillA]: Robot) => void
@@ -125,14 +125,14 @@ foo1(["roomba", ["vacuum", "mopping"]]);
 >     : ^          ^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, [string, string]]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : [string, string]
 >                      : ^^^^^^^^^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -149,14 +149,14 @@ foo2(["roomba", ["vacuum", "mopping"]]);
 >     : ^        ^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, [string, string]]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : [string, string]
 >                      : ^^^^^^^^^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -173,14 +173,14 @@ foo3(["roomba", ["vacuum", "mopping"]]);
 >     : ^                                          ^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, [string, string]]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : [string, string]
 >                      : ^^^^^^^^^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 foo4(robotA);
 >foo4(robotA) : void
@@ -197,12 +197,12 @@ foo4(["roomba", ["vacuum", "mopping"]]);
 >     : ^                    ^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, [string, string]]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : [string, string]
 >                      : ^^^^^^^^^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
index 5f125089006..8f83f04f17c 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
@@ -19,12 +19,12 @@ var robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 function foo1([, nameA = "noName"]: Robot = [-1, "name", "skill"]) {
 >foo1 : ([, nameA]?: Robot) => void
@@ -33,18 +33,18 @@ function foo1([, nameA = "noName"]: Robot = [-1, "name", "skill"]) {
 > : ^^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >[-1, "name", "skill"] : [number, string, string]
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^
 >-1 : -1
 >   : ^^
 >1 : 1
 >  : ^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 
     console.log(nameA);
 >console.log(nameA) : void
@@ -74,10 +74,10 @@ function foo2([numberB = -1]: Robot = [-1, "name", "skill"]) {
 >   : ^^
 >1 : 1
 >  : ^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 
     console.log(numberB);
 >console.log(numberB) : void
@@ -103,22 +103,22 @@ function foo3([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]: Robot = [-1,
 >  : ^
 >nameA2 : string
 >       : ^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >skillA2 : string
 >        : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 >[-1, "name", "skill"] : [number, string, string]
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^
 >-1 : -1
 >   : ^^
 >1 : 1
 >  : ^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 
     console.log(nameA2);
 >console.log(nameA2) : void
@@ -150,10 +150,10 @@ function foo4([numberA3 = -1, ...robotAInfo]: Robot = [-1, "name", "skill"]) {
 >   : ^^
 >1 : 1
 >  : ^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
->"skill" : string
->        : ^^^^^^
+>"skill" : "skill"
+>        : ^^^^^^^
 
     console.log(robotAInfo);
 >console.log(robotAInfo) : void
@@ -183,12 +183,12 @@ foo1([2, "trimmer", "trimming"]);
 >     : ^         ^^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -205,12 +205,12 @@ foo2([2, "trimmer", "trimming"]);
 >     : ^         ^^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -227,12 +227,12 @@ foo3([2, "trimmer", "trimming"]);
 >     : ^                           ^^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 foo4(robotA);
 >foo4(robotA) : void
@@ -249,10 +249,10 @@ foo4([2, "trimmer", "trimming"]);
 >     : ^                         ^^^     ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
index ef1eac5f0dc..9fb722f9619 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
@@ -19,14 +19,14 @@ var robotA: Robot = ["trimmer", ["trimming", "edging"]];
 >       : ^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                    : ^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : string[]
 >                       : ^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 function foo1([, skillA = ["noSkill", "noSkill"]]: Robot= ["name", ["skill1", "skill2"]]) {
 >foo1 : ([, skillA]?: Robot) => void
@@ -37,20 +37,20 @@ function foo1([, skillA = ["noSkill", "noSkill"]]: Robot= ["name", ["skill1", "s
 >       : ^^^^^^^^
 >["noSkill", "noSkill"] : string[]
 >                       : ^^^^^^^^
->"noSkill" : string
->          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >["name", ["skill1", "skill2"]] : [string, string[]]
 >                               : ^^^^^^^^^^^^^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >["skill1", "skill2"] : string[]
 >                     : ^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 
     console.log(skillA);
 >console.log(skillA) : void
@@ -70,18 +70,18 @@ function foo2([nameMB = "noName"]: Robot = ["name", ["skill1", "skill2"]]) {
 >     : ^        ^^^     ^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 >["name", ["skill1", "skill2"]] : [string, string[]]
 >                               : ^^^^^^^^^^^^^^^^^^
->"name" : string
+>"name" : "name"
 >       : ^^^^^^
 >["skill1", "skill2"] : string[]
 >                     : ^^^^^^^^
->"skill1" : string
->         : ^^^^^^
->"skill2" : string
->         : ^^^^^^
+>"skill1" : "skill1"
+>         : ^^^^^^^^
+>"skill2" : "skill2"
+>         : ^^^^^^^^
 
     console.log(nameMB);
 >console.log(nameMB) : void
@@ -101,8 +101,8 @@ function foo3([nameMA = "noName", [
 >     : ^                                          ^^     ^^^^^^^^^
 >nameMA : string
 >       : ^^^^^^
->"noName" : string
->         : ^^^^^^
+>"noName" : "noName"
+>         : ^^^^^^^^
 
     primarySkillA = "primary",
 >primarySkillA : string
@@ -119,10 +119,10 @@ function foo3([nameMA = "noName", [
 ] = ["noSkill", "noSkill"]]: Robot) {
 >["noSkill", "noSkill"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"noSkill" : string
->          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
     console.log(nameMA);
 >console.log(nameMA) : void
@@ -152,14 +152,14 @@ foo1(["roomba", ["vacuum", "mopping"]]);
 >     : ^          ^^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, string[]]
 >                                  : ^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : string[]
 >                      : ^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 foo2(robotA);
 >foo2(robotA) : void
@@ -176,14 +176,14 @@ foo2(["roomba", ["vacuum", "mopping"]]);
 >     : ^        ^^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, string[]]
 >                                  : ^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : string[]
 >                      : ^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 foo3(robotA);
 >foo3(robotA) : void
@@ -200,12 +200,12 @@ foo3(["roomba", ["vacuum", "mopping"]]);
 >     : ^                                          ^^     ^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, string[]]
 >                                  : ^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : string[]
 >                      : ^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types
index d667afdf2e4..3bf079b6ce0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types
@@ -33,12 +33,12 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >robotB : Robot
@@ -47,12 +47,12 @@ var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 var { name: nameA } = robotA;
 >name : any
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types
index 6e7e474dba5..6563370699d 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types
@@ -33,12 +33,12 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skill : string
 >      : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >robotB : Robot
@@ -47,12 +47,12 @@ var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skill : string
 >      : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 var a: string, { name: nameA } = robotA;
 >a : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types
index e0c10ce7daa..dc216bdd79e 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types
@@ -20,24 +20,24 @@ var robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 
 let [, nameA] = robotA;
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types
index 17198d05442..acc986e9ddb 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types
@@ -20,28 +20,28 @@ var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let [, skillA] = multiRobotA;
 > : undefined
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types
index 00bd1b19914..362eee3615e 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types
@@ -23,52 +23,52 @@ var robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let nameA: string, numberB: number, nameB: string, skillB: string;
 >nameA : string
@@ -135,10 +135,10 @@ let multiRobotAInfo: (string | [string, string])[];
 >      : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
 
@@ -179,14 +179,14 @@ let multiRobotAInfo: (string | [string, string])[];
 >            : ^^^^^^^^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, [string, string]]
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : [string, string]
 >                      : ^^^^^^^^^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 [numberB] = robotB;
 >[numberB] = robotB : Robot
@@ -219,8 +219,8 @@ let multiRobotAInfo: (string | [string, string])[];
 >        : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >"trimmer" : "trimmer"
 >          : ^^^^^^^^^
 >"trimming" : "trimming"
@@ -257,8 +257,8 @@ let multiRobotAInfo: (string | [string, string])[];
 >       : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                    : ^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : string[]
 >                       : ^^^^^^^^
 >"trimming" : "trimming"
@@ -309,12 +309,12 @@ let multiRobotAInfo: (string | [string, string])[];
 >       : ^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 [nameMB, [primarySkillB, secondarySkillB]] = multiRobotB;
 >[nameMB, [primarySkillB, secondarySkillB]] = multiRobotB : MultiSkilledRobot
@@ -365,14 +365,14 @@ let multiRobotAInfo: (string | [string, string])[];
 >                : ^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 [numberB, ...robotAInfo] = robotB;
 >[numberB, ...robotAInfo] = robotB : Robot
@@ -419,12 +419,12 @@ let multiRobotAInfo: (string | [string, string])[];
 >                                  : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 [...multiRobotAInfo] = multiRobotA;
 >[...multiRobotAInfo] = multiRobotA : MultiSkilledRobot
@@ -467,10 +467,10 @@ let multiRobotAInfo: (string | [string, string])[];
 >          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 if (nameA == nameB) {
 >nameA == nameB : boolean
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types
index 5a4686b13ca..b319dffea43 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types
@@ -23,52 +23,52 @@ var robotA: Robot = [1, "mower", "mowing"];
 >       : ^^^^^
 >[1, "mower", "mowing"] : [number, string, string]
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"mower" : string
->        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"mower" : "mower"
+>        : ^^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : Robot
 >       : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["mower", ["mowing", ""]] : [string, string[]]
 >                          : ^^^^^^^^^^^^^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >["mowing", ""] : string[]
 >               : ^^^^^^^^
->"mowing" : string
->         : ^^^^^^
->"" : string
->   : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
+>"" : ""
+>   : ^^
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                    : ^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : string[]
 >                       : ^^^^^^^^
->"trimming" : string
->           : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 let nameA: string, numberB: number, nameB: string, skillB: string;
 >nameA : string
@@ -105,12 +105,12 @@ let multiRobotAInfo: (string | string[])[];
 >                          : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameA = "helloNoName" : string
->                      : ^^^^^^
+>nameA = "helloNoName" : "helloNoName"
+>                      : ^^^^^^^^^^^^^
 >nameA : string
 >      : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >robotA : Robot
 >       : ^^^^^
 
@@ -121,12 +121,12 @@ let multiRobotAInfo: (string | string[])[];
 >                          : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameB = "helloNoName" : string
->                      : ^^^^^^
+>nameB = "helloNoName" : "helloNoName"
+>                      : ^^^^^^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >getRobotB() : Robot
 >            : ^^^^^
 >getRobotB : () => Robot
@@ -139,18 +139,18 @@ let multiRobotAInfo: (string | string[])[];
 >                          : ^^^^^^^^^^^^^^^^^^^
 > : undefined
 > : ^^^^^^^^^
->nameB = "helloNoName" : string
->                      : ^^^^^^
+>nameB = "helloNoName" : "helloNoName"
+>                      : ^^^^^^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >"trimming" : "trimming"
 >           : ^^^^^^^^^^
 
@@ -203,14 +203,14 @@ let multiRobotAInfo: (string | string[])[];
 >   : ^^^^^^^^^^^
 >["roomba", ["vacuum", "mopping"]] : [string, string[]]
 >                                  : ^^^^^^^^^^^^^^^^^^
->"roomba" : string
->         : ^^^^^^
+>"roomba" : "roomba"
+>         : ^^^^^^^^
 >["vacuum", "mopping"] : string[]
 >                      : ^^^^^^^^
->"vacuum" : string
->         : ^^^^^^
->"mopping" : string
->          : ^^^^^^
+>"vacuum" : "vacuum"
+>         : ^^^^^^^^
+>"mopping" : "mopping"
+>          : ^^^^^^^^^
 
 [numberB = -1] = robotB;
 >[numberB = -1] = robotB : Robot
@@ -261,8 +261,8 @@ let multiRobotAInfo: (string | string[])[];
 >  : ^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >"trimmer" : "trimmer"
 >          : ^^^^^^^^^
 >"trimming" : "trimming"
@@ -273,12 +273,12 @@ let multiRobotAInfo: (string | string[])[];
 >                                       : ^^^^^^^^^^^^^^^^^
 >[nameMB = "helloNoName"] : [string]
 >                         : ^^^^^^^^
->nameMB = "helloNoName" : string
->                       : ^^^^^^
+>nameMB = "helloNoName" : "helloNoName"
+>                       : ^^^^^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >multiRobotB : MultiSkilledRobot
 >            : ^^^^^^^^^^^^^^^^^
 
@@ -287,12 +287,12 @@ let multiRobotAInfo: (string | string[])[];
 >                                            : ^^^^^^^^^^^^^^^^^
 >[nameMB = "helloNoName"] : [string]
 >                         : ^^^^^^^^
->nameMB = "helloNoName" : string
->                       : ^^^^^^
+>nameMB = "helloNoName" : "helloNoName"
+>                       : ^^^^^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >getMultiRobotB() : MultiSkilledRobot
 >                 : ^^^^^^^^^^^^^^^^^
 >getMultiRobotB : () => MultiSkilledRobot
@@ -303,16 +303,16 @@ let multiRobotAInfo: (string | string[])[];
 >                                                               : ^^^^^^^^^^^^^^^^^^
 >[nameMB = "helloNoName"] : [string]
 >                         : ^^^^^^^^
->nameMB = "helloNoName" : string
->                       : ^^^^^^
+>nameMB = "helloNoName" : "helloNoName"
+>                       : ^^^^^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >                                    : ^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : string[]
 >                       : ^^^^^^^^
 >"trimming" : "trimming"
@@ -333,18 +333,18 @@ let multiRobotAInfo: (string | string[])[];
 >   : ^^
 >1 : 1
 >  : ^
->nameB = "helloNoName" : string
->                      : ^^^^^^
+>nameB = "helloNoName" : "helloNoName"
+>                      : ^^^^^^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
->skillB = "noSkill" : string
->                   : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
+>skillB = "noSkill" : "noSkill"
+>                   : ^^^^^^^^^
 >skillB : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >robotB : Robot
 >       : ^^^^^
 
@@ -361,18 +361,18 @@ let multiRobotAInfo: (string | string[])[];
 >   : ^^
 >1 : 1
 >  : ^
->nameB = "helloNoName" : string
->                      : ^^^^^^
+>nameB = "helloNoName" : "helloNoName"
+>                      : ^^^^^^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
->skillB = "noSkill" : string
->                   : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
+>skillB = "noSkill" : "noSkill"
+>                   : ^^^^^^^^^
 >skillB : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >getRobotB() : Robot
 >            : ^^^^^
 >getRobotB : () => Robot
@@ -391,54 +391,54 @@ let multiRobotAInfo: (string | string[])[];
 >   : ^^
 >1 : 1
 >  : ^
->nameB = "helloNoName" : string
->                      : ^^^^^^
+>nameB = "helloNoName" : "helloNoName"
+>                      : ^^^^^^^^^^^^^
 >nameB : string
 >      : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
->skillB = "noSkill" : string
->                   : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
+>skillB = "noSkill" : "noSkill"
+>                   : ^^^^^^^^^
 >skillB : string
 >       : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 [nameMB = "helloNoName", [primarySkillB = "noSkill", secondarySkillB = "noSkill"] = []] = multiRobotB;
 >[nameMB = "helloNoName", [primarySkillB = "noSkill", secondarySkillB = "noSkill"] = []] = multiRobotB : MultiSkilledRobot
 >                                                                                                      : ^^^^^^^^^^^^^^^^^
 >[nameMB = "helloNoName", [primarySkillB = "noSkill", secondarySkillB = "noSkill"] = []] : [string, []]
 >                                                                                        : ^^^^^^^^^^^^
->nameMB = "helloNoName" : string
->                       : ^^^^^^
+>nameMB = "helloNoName" : "helloNoName"
+>                       : ^^^^^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >[primarySkillB = "noSkill", secondarySkillB = "noSkill"] = [] : []
 >                                                              : ^^
 >[primarySkillB = "noSkill", secondarySkillB = "noSkill"] : [string, string]
 >                                                         : ^^^^^^^^^^^^^^^^
->primarySkillB = "noSkill" : string
->                          : ^^^^^^
+>primarySkillB = "noSkill" : "noSkill"
+>                          : ^^^^^^^^^
 >primarySkillB : string
 >              : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
->secondarySkillB = "noSkill" : string
->                            : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
+>secondarySkillB = "noSkill" : "noSkill"
+>                            : ^^^^^^^^^
 >secondarySkillB : string
 >                : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >[] : []
 >   : ^^
 >multiRobotB : MultiSkilledRobot
@@ -449,28 +449,28 @@ let multiRobotAInfo: (string | string[])[];
 >                                                                                                           : ^^^^^^^^^^^^^^^^^
 >[nameMB = "helloNoName", [primarySkillB = "noSkill", secondarySkillB = "noSkill"] = []] : [string, []]
 >                                                                                        : ^^^^^^^^^^^^
->nameMB = "helloNoName" : string
->                       : ^^^^^^
+>nameMB = "helloNoName" : "helloNoName"
+>                       : ^^^^^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >[primarySkillB = "noSkill", secondarySkillB = "noSkill"] = [] : []
 >                                                              : ^^
 >[primarySkillB = "noSkill", secondarySkillB = "noSkill"] : [string, string]
 >                                                         : ^^^^^^^^^^^^^^^^
->primarySkillB = "noSkill" : string
->                          : ^^^^^^
+>primarySkillB = "noSkill" : "noSkill"
+>                          : ^^^^^^^^^
 >primarySkillB : string
 >              : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
->secondarySkillB = "noSkill" : string
->                            : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
+>secondarySkillB = "noSkill" : "noSkill"
+>                            : ^^^^^^^^^
 >secondarySkillB : string
 >                : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >[] : []
 >   : ^^
 >getMultiRobotB() : MultiSkilledRobot
@@ -483,36 +483,36 @@ let multiRobotAInfo: (string | string[])[];
 >                                                                                                                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[nameMB = "helloNoName", [primarySkillB = "noSkill", secondarySkillB = "noSkill"] = []] : [string, []]
 >                                                                                        : ^^^^^^^^^^^^
->nameMB = "helloNoName" : string
->                       : ^^^^^^
+>nameMB = "helloNoName" : "helloNoName"
+>                       : ^^^^^^^^^^^^^
 >nameMB : string
 >       : ^^^^^^
->"helloNoName" : string
->              : ^^^^^^
+>"helloNoName" : "helloNoName"
+>              : ^^^^^^^^^^^^^
 >[primarySkillB = "noSkill", secondarySkillB = "noSkill"] = [] : []
 >                                                              : ^^
 >[primarySkillB = "noSkill", secondarySkillB = "noSkill"] : [string, string]
 >                                                         : ^^^^^^^^^^^^^^^^
->primarySkillB = "noSkill" : string
->                          : ^^^^^^
+>primarySkillB = "noSkill" : "noSkill"
+>                          : ^^^^^^^^^
 >primarySkillB : string
 >              : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
->secondarySkillB = "noSkill" : string
->                            : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
+>secondarySkillB = "noSkill" : "noSkill"
+>                            : ^^^^^^^^^
 >secondarySkillB : string
 >                : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >[] : []
 >   : ^^
 
     ["trimmer", ["trimming", "edging"]];
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >["trimming", "edging"] : [string, string]
 >                       : ^^^^^^^^^^^^^^^^
 >"trimming" : "trimming"
@@ -583,12 +583,12 @@ let multiRobotAInfo: (string | string[])[];
 >                                  : ^^^^^
 >[2, "trimmer", "trimming"] : [number, string, string]
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^
->2 : number
->  : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>2 : 2
+>  : ^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 
 if (nameA == nameB) {
 >nameA == nameB : boolean
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types
index f039b54e45c..c8071130329 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types
@@ -37,19 +37,19 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 var robotB: Robot = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } };
@@ -59,20 +59,20 @@ var robotB: Robot = { name: "trimmer", skills: { primary: "trimming", secondary:
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 var { skills: { primary: primaryA, secondary: secondaryA } } = robotA;
 >skills : any
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types
index e242a7e21e3..f7f4218e1f4 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types
@@ -37,19 +37,19 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 >                                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"mower" : string
->        : ^^^^^^
+>"mower" : "mower"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "mowing", secondary: "none" } : { primary: string; secondary: string; }
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"mowing" : string
->         : ^^^^^^
+>"mowing" : "mowing"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"none" : string
+>"none" : "none"
 >       : ^^^^^^
 
 var robotB: Robot = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } };
@@ -59,20 +59,20 @@ var robotB: Robot = { name: "trimmer", skills: { primary: "trimming", secondary:
 >                                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"trimmer" : string
->          : ^^^^^^
+>"trimmer" : "trimmer"
+>          : ^^^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "trimming", secondary: "edging" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"trimming" : string
->           : ^^^^^^
+>"trimming" : "trimming"
+>           : ^^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 
 var {
     skills: {
@@ -84,28 +84,28 @@ var {
 >        : ^^^
 >primaryA : string
 >         : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
         secondary: secondaryA = "noSkill"
 >secondary : any
 >          : ^^^
 >secondaryA : string
 >           : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
     } = { primary: "noSkill", secondary: "noSkill" }
 >{ primary: "noSkill", secondary: "noSkill" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } = robotA;
 >robotA : Robot
@@ -117,8 +117,8 @@ var {
 >     : ^^^
 >nameB : string
 >      : ^^^^^^
->"noNameSpecified" : string
->                  : ^^^^^^
+>"noNameSpecified" : "noNameSpecified"
+>                  : ^^^^^^^^^^^^^^^^^
 
     skills: {
 >skills : any
@@ -129,28 +129,28 @@ var {
 >        : ^^^
 >primaryB : string
 >         : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
         secondary: secondaryB = "noSkill"
 >secondary : any
 >          : ^^^
 >secondaryB : string
 >           : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
     } = { primary: "noSkill", secondary: "noSkill" }
 >{ primary: "noSkill", secondary: "noSkill" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } = robotB;
 >robotB : Robot
@@ -162,8 +162,8 @@ var {
 >     : ^^^
 >nameC : string
 >      : ^^^^^^
->"noNameSpecified" : string
->                  : ^^^^^^
+>"noNameSpecified" : "noNameSpecified"
+>                  : ^^^^^^^^^^^^^^^^^
 
     skills: {
 >skills : any
@@ -174,28 +174,28 @@ var {
 >        : ^^^
 >primaryB : string
 >         : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
         secondary: secondaryB = "noSkill"
 >secondary : any
 >          : ^^^
 >secondaryB : string
 >           : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
     } = { primary: "noSkill", secondary: "noSkill" }
 >{ primary: "noSkill", secondary: "noSkill" } : { primary: string; secondary: string; }
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"noSkill" : string
->          : ^^^^^^
+>"noSkill" : "noSkill"
+>          : ^^^^^^^^^
 
 } = <Robot>{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } };
 ><Robot>{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : Robot
@@ -204,20 +204,20 @@ var {
 >                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"Edger" : string
->        : ^^^^^^
+>"Edger" : "Edger"
+>        : ^^^^^^^
 >skills : { primary: string; secondary: string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ primary: "edging", secondary: "branch trimming" } : { primary: string; secondary: string; }
 >                                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >primary : string
 >        : ^^^^^^
->"edging" : string
->         : ^^^^^^
+>"edging" : "edging"
+>         : ^^^^^^^^
 >secondary : string
 >          : ^^^^^^
->"branch trimming" : string
->                  : ^^^^^^
+>"branch trimming" : "branch trimming"
+>                  : ^^^^^^^^^^^^^^^^^
 
 if (nameB == nameB) {
 >nameB == nameB : boolean
diff --git a/tests/baselines/reference/sourceMapValidationFor.types b/tests/baselines/reference/sourceMapValidationFor.types
index f0d43de978f..53b988718e8 100644
--- a/tests/baselines/reference/sourceMapValidationFor.types
+++ b/tests/baselines/reference/sourceMapValidationFor.types
@@ -34,12 +34,12 @@ for (var i = 0; i < 10; i++) {
 >  : ^^^^^^
 }
 for (i = 0; i < 10; i++)
->i = 0 : number
->      : ^^^^^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >i < 10 : boolean
 >       : ^^^^^^^
 >i : number
@@ -97,12 +97,12 @@ for (var j = 0; j < 10; ) {
     }
 }
 for (j = 0; j < 10;)
->j = 0 : number
->      : ^^^^^^
+>j = 0 : 0
+>      : ^
 >j : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >j < 10 : boolean
 >       : ^^^^^^^
 >j : number
@@ -127,12 +127,12 @@ for (var k = 0;; k++) {
 >  : ^^^^^^
 }
 for (k = 0;; k++)
->k = 0 : number
->      : ^^^^^^
+>k = 0 : 0
+>      : ^
 >k : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >k++ : number
 >    : ^^^^^^
 >k : number
@@ -167,20 +167,20 @@ for (;;)
 >  : ^^^^^^
 }
 for (i = 0, j = 20; j < 20, i < 20; j++) {
->i = 0, j = 20 : number
->              : ^^^^^^
->i = 0 : number
->      : ^^^^^^
+>i = 0, j = 20 : 20
+>              : ^^
+>i = 0 : 0
+>      : ^
 >i : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
->j = 20 : number
->       : ^^^^^^
+>0 : 0
+>  : ^
+>j = 20 : 20
+>       : ^^
 >j : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 >j < 20, i < 20 : boolean
 >               : ^^^^^^^
 >j < 20 : boolean
diff --git a/tests/baselines/reference/sourceMapValidationFunctionExpressions.types b/tests/baselines/reference/sourceMapValidationFunctionExpressions.types
index 2b3042efb63..07ecb36cc88 100644
--- a/tests/baselines/reference/sourceMapValidationFunctionExpressions.types
+++ b/tests/baselines/reference/sourceMapValidationFunctionExpressions.types
@@ -30,8 +30,8 @@ greet("Hello");
 >               : ^^^^^^
 >greet : (greeting: string) => number
 >      : ^        ^^      ^^^^^      
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
 var incrGreetings = () => greetings++;
 >incrGreetings : () => number
diff --git a/tests/baselines/reference/sourceMapValidationStatements.types b/tests/baselines/reference/sourceMapValidationStatements.types
index fa8c1f7a845..c81165c2780 100644
--- a/tests/baselines/reference/sourceMapValidationStatements.types
+++ b/tests/baselines/reference/sourceMapValidationStatements.types
@@ -146,7 +146,7 @@ function f() {
     }
     try {
         obj.q = "ohhh";
->obj.q = "ohhh" : string
+>obj.q = "ohhh" : "ohhh"
 >               : ^^^^^^
 >obj.q : string
 >      : ^^^^^^
@@ -154,7 +154,7 @@ function f() {
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >q : string
 >  : ^^^^^^
->"ohhh" : string
+>"ohhh" : "ohhh"
 >       : ^^^^^^
 
     } catch (e) {
@@ -174,29 +174,29 @@ function f() {
 >   : ^^
 
             obj.z = 12;
->obj.z = 12 : number
->           : ^^^^^^
+>obj.z = 12 : 12
+>           : ^^
 >obj.z : number
 >      : ^^^^^^
 >obj : { z: number; q: string; }
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >z : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
         } else {
             obj.q = "hmm";
->obj.q = "hmm" : string
->              : ^^^^^^
+>obj.q = "hmm" : "hmm"
+>              : ^^^^^
 >obj.q : string
 >      : ^^^^^^
 >obj : { z: number; q: string; }
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >q : string
 >  : ^^^^^^
->"hmm" : string
->      : ^^^^^^
+>"hmm" : "hmm"
+>      : ^^^^^
         }
     }
     try {
@@ -289,12 +289,12 @@ function f() {
 >  : ^
 
             x = 50;
->x = 50 : number
->       : ^^^^^^
+>x = 50 : 50
+>       : ^^
 >x : number
 >  : ^^^^^^
->50 : number
->   : ^^^^^^
+>50 : 50
+>   : ^^
 
             break;
 
@@ -396,24 +396,24 @@ function f() {
 >  : ^
 
     x = z = 40;
->x = z = 40 : number
->           : ^^^^^^
+>x = z = 40 : 40
+>           : ^^
 >x : number
 >  : ^^^^^^
->z = 40 : number
->       : ^^^^^^
+>z = 40 : 40
+>       : ^^
 >z : number
 >  : ^^^^^^
->40 : number
->   : ^^^^^^
+>40 : 40
+>   : ^^
 
     eval("y");
 >eval("y") : any
 >          : ^^^
 >eval : (x: string) => any
 >     : ^ ^^      ^^^^^   
->"y" : string
->    : ^^^^^^
+>"y" : "y"
+>    : ^^^
 
     return;
 }
diff --git a/tests/baselines/reference/specialIntersectionsInMappedTypes.types b/tests/baselines/reference/specialIntersectionsInMappedTypes.types
index 49b4f2b3b66..f9a7fe5ea6b 100644
--- a/tests/baselines/reference/specialIntersectionsInMappedTypes.types
+++ b/tests/baselines/reference/specialIntersectionsInMappedTypes.types
@@ -20,26 +20,26 @@ const a: Alignments = {
     left: "align-left",
 >left : string
 >     : ^^^^^^
->"align-left" : string
->             : ^^^^^^
+>"align-left" : "align-left"
+>             : ^^^^^^^^^^^^
 
     center: "align-center",
 >center : string
 >       : ^^^^^^
->"align-center" : string
->               : ^^^^^^
+>"align-center" : "align-center"
+>               : ^^^^^^^^^^^^^^
 
     right: "align-right",
 >right : string
 >      : ^^^^^^
->"align-right" : string
->              : ^^^^^^
+>"align-right" : "align-right"
+>              : ^^^^^^^^^^^^^
 
     other: "align-other",
 >other : string
 >      : ^^^^^^
->"align-other" : string
->              : ^^^^^^
+>"align-other" : "align-other"
+>              : ^^^^^^^^^^^^^
 
 };
 
diff --git a/tests/baselines/reference/specializeVarArgs1.types b/tests/baselines/reference/specializeVarArgs1.types
index 9f0ea6cd4d9..4a8cfd38f5b 100644
--- a/tests/baselines/reference/specializeVarArgs1.types
+++ b/tests/baselines/reference/specializeVarArgs1.types
@@ -41,6 +41,6 @@ a.push('Some Value');
 >  : ^^^^^^^^^^^^^^^^^^^^^^^
 >push : (...values: string[]) => any
 >     : ^^^^      ^^^^^^^^^^^^^^^^^^
->'Some Value' : string
->             : ^^^^^^
+>'Some Value' : "Some Value"
+>             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.types b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.types
index cfec11d02b9..4db6bb86a72 100644
--- a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.types
+++ b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.types
@@ -45,26 +45,26 @@ x3(1, (x: string) => 1);
 >                        : ^^^
 >x3 : { (a: number, cb: (x: number) => number): any; (a: string, cb: (x: number) => number): any; }
 >   : ^^^ ^^      ^^  ^^                     ^^^^^^^^^ ^^      ^^  ^^                     ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: string) => 1 : (x: string) => number
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x3(1, (x: 'hm') => 1); 
 >x3(1, (x: 'hm') => 1) : any
 >                      : ^^^
 >x3 : { (a: number, cb: (x: number) => number): any; (a: string, cb: (x: number) => number): any; }
 >   : ^^^ ^^      ^^  ^^                     ^^^^^^^^^ ^^      ^^  ^^                     ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(x: 'hm') => 1 : (x: "hm") => number
 >               : ^ ^^    ^^^^^^^^^^^
 >x : "hm"
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/spliceTuples.types b/tests/baselines/reference/spliceTuples.types
index 8415e53fc55..5e422eda0e5 100644
--- a/tests/baselines/reference/spliceTuples.types
+++ b/tests/baselines/reference/spliceTuples.types
@@ -16,8 +16,8 @@ k1 = [1, ...sb];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, ...sb] : [number, string, boolean]
 >           : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sb : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >sb : [string, boolean]
@@ -34,8 +34,8 @@ k2 = [1, ...sb, 1];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, ...sb, 1] : [number, string, boolean, number]
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sb : string | boolean
 >      : ^^^^^^^^^^^^^^^^
 >sb : [string, boolean]
@@ -58,8 +58,8 @@ k3 = [1, ...sb_];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, ...sb_] : [number, string, ...boolean[]]
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sb_ : string | boolean
 >       : ^^^^^^^^^^^^^^^^
 >sb_ : [string, ...boolean[]]
@@ -80,8 +80,8 @@ k4 = [1, ...sbb_];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, ...sbb_] : [number, string, boolean, ...boolean[]]
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sbb_ : string | boolean
 >        : ^^^^^^^^^^^^^^^^
 >sbb_ : [string, boolean, ...boolean[]]
@@ -98,8 +98,8 @@ k5 = [1, ...sbb_];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, ...sbb_] : [number, string, boolean, ...boolean[]]
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sbb_ : string | boolean
 >        : ^^^^^^^^^^^^^^^^
 >sbb_ : [string, boolean, ...boolean[]]
@@ -116,8 +116,8 @@ k6 = [1, ...sbb_];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, ...sbb_] : [number, string, boolean, ...boolean[]]
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sbb_ : string | boolean
 >        : ^^^^^^^^^^^^^^^^
 >sbb_ : [string, boolean, ...boolean[]]
diff --git a/tests/baselines/reference/spreadMethods.types b/tests/baselines/reference/spreadMethods.types
index ad8dfe27beb..a246f69552e 100644
--- a/tests/baselines/reference/spreadMethods.types
+++ b/tests/baselines/reference/spreadMethods.types
@@ -120,8 +120,8 @@ let i: I = { p: 12, m() { }, get g() { return 0; } };
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >p : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >m : () => void
 >  : ^^^^^^^^^^
 >g : number
diff --git a/tests/baselines/reference/spreadNonPrimitive.types b/tests/baselines/reference/spreadNonPrimitive.types
index 6b9644f43e0..d10560e2f2f 100644
--- a/tests/baselines/reference/spreadNonPrimitive.types
+++ b/tests/baselines/reference/spreadNonPrimitive.types
@@ -16,12 +16,12 @@ const x: { a: number, b: number } = { a: 1, ...o, b: 2 };
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >o : object
 >  : ^^^^^^
 >b : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.types b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.types
index 25b7ab92b2c..c47dec439ed 100644
--- a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.types
+++ b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.types
@@ -24,6 +24,6 @@ const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };
 >    : ^^^
 >"b" : "b"
 >    : ^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/spreadTypeRemovesReadonly.types b/tests/baselines/reference/spreadTypeRemovesReadonly.types
index 65870b8a50d..1f78ec19e52 100644
--- a/tests/baselines/reference/spreadTypeRemovesReadonly.types
+++ b/tests/baselines/reference/spreadTypeRemovesReadonly.types
@@ -14,8 +14,8 @@ const data: ReadonlyData = { value: 'foo' };
 >                 : ^^^^^^^^^^^^^^^^^^
 >value : string
 >      : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 const clone = { ...data };
 >clone : { value: string; }
@@ -26,14 +26,14 @@ const clone = { ...data };
 >     : ^^^^^^^^^^^^
 
 clone.value = 'bar';
->clone.value = 'bar' : string
->                    : ^^^^^^
+>clone.value = 'bar' : "bar"
+>                    : ^^^^^
 >clone.value : string
 >            : ^^^^^^
 >clone : { value: string; }
 >      : ^^^^^^^^^      ^^^
 >value : string
 >      : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/spreadUnion3.types b/tests/baselines/reference/spreadUnion3.types
index 7e7a668dfd3..007e530937f 100644
--- a/tests/baselines/reference/spreadUnion3.types
+++ b/tests/baselines/reference/spreadUnion3.types
@@ -16,8 +16,8 @@ function f(x: { y: string } | undefined): { y: string } {
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >y : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 >x : { y: string; } | undefined
 >  : ^^^^^      ^^^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/spreadsAndContextualTupleTypes.types b/tests/baselines/reference/spreadsAndContextualTupleTypes.types
index 53b578faad2..a7e2d9aec9a 100644
--- a/tests/baselines/reference/spreadsAndContextualTupleTypes.types
+++ b/tests/baselines/reference/spreadsAndContextualTupleTypes.types
@@ -34,12 +34,12 @@ fx1(['x', 'y', 'z', 'a']);
 >    : ^ ^^^^^^^^^                                   ^^ ^^ ^^^^^ 
 >['x', 'y', 'z', 'a'] : [string, string, string, "a"]
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'x' : string
->    : ^^^^^^
->'y' : string
->    : ^^^^^^
->'z' : string
->    : ^^^^^^
+>'x' : "x"
+>    : ^^^
+>'y' : "y"
+>    : ^^^
+>'z' : "z"
+>    : ^^^
 >'a' : "a"
 >    : ^^^
 
@@ -64,12 +64,12 @@ fx2(['x', 'y', 'z', 'a']);
 >    : ^ ^^^^^^^^^                        ^^ ^^ ^^^^^ 
 >['x', 'y', 'z', 'a'] : [string, string, string, "a"]
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'x' : string
->    : ^^^^^^
->'y' : string
->    : ^^^^^^
->'z' : string
->    : ^^^^^^
+>'x' : "x"
+>    : ^^^
+>'y' : "y"
+>    : ^^^
+>'z' : "z"
+>    : ^^^
 >'a' : "a"
 >    : ^^^
 
@@ -100,8 +100,8 @@ const x2: [...string[], '!'] = ['a', '!'];
 >   : ^^^^^^^^^^^^^^^^^^
 >['a', '!'] : [string, "!"]
 >           : ^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >'!' : "!"
 >    : ^^^
 
@@ -160,8 +160,8 @@ const randomID = 'id' as string;
 >         : ^^^^^^
 >'id' as string : string
 >               : ^^^^^^
->'id' : string
->     : ^^^^^^
+>'id' : "id"
+>     : ^^^^
 
 declare function foo<const T>(path: T): T;
 >foo : <const T>(path: T) => T
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
index fefd4f0a617..0697ec2a909 100644
--- a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
@@ -33,8 +33,8 @@ let y: number = outer(5).y;
 >         : ^^^^^^^^^^^^
 >outer : <T>(x: T) => typeof Inner
 >      : ^ ^^ ^^ ^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : number
 >  : ^^^^^^
 
@@ -59,8 +59,8 @@ class ListWrapper2 {
 >      : ^^^
 >slice : (start?: number, end?: number) => T[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   static reversed<T>(dit: typeof ListWrapper2, array: T[]): T[] {
 >reversed : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
@@ -239,8 +239,8 @@ class ListWrapper {
 >      : ^^^
 >slice : (start?: number, end?: number) => T[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   static forEachWithIndex<T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) {
 >forEachWithIndex : <T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) => void
@@ -374,8 +374,8 @@ class ListWrapper {
 >      : ^
 >startIndex : number
 >           : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     return array.indexOf(value, startIndex);
 >array.indexOf(value, startIndex) : number
@@ -458,10 +458,10 @@ class ListWrapper {
 >        : ^^^^^^^
 >scanRange : <T_1>(start: number, length: number, callback: () => T_1) => T_1
 >          : ^^^^^^     ^^      ^^      ^^      ^^        ^^         ^^^^^   
->3 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>5 : 5
+>  : ^
 >() => {  } : () => void
 >           : ^^^^^^^^^^
 
@@ -546,8 +546,8 @@ class ListWrapper {
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >value : T
 >      : ^
 
@@ -584,8 +584,8 @@ class ListWrapper {
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     return res;
 >res : T
@@ -652,8 +652,8 @@ class ListWrapper {
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
   }
   static remove<T>(dit: typeof ListWrapper, list: T[], el: T): boolean {
@@ -703,8 +703,8 @@ class ListWrapper {
 >       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
       return true;
 >true : true
@@ -723,16 +723,16 @@ class ListWrapper {
 >            : ^^^^^^^^^^^^^^^^^^
 >list : any[]
 >     : ^^^^^
->list.length = 0 : number
->                : ^^^^^^
+>list.length = 0 : 0
+>                : ^
 >list.length : number
 >            : ^^^^^^
 >list : any[]
 >     : ^^^^^
 >length : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
   static isEmpty(dit: typeof ListWrapper, list: any[]): boolean { return list.length == 0; }
 >isEmpty : (dit: typeof ListWrapper, list: any[]) => boolean
@@ -766,8 +766,8 @@ class ListWrapper {
 >value : any
 >start : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >end : number
 >    : ^^^^^^
 
@@ -879,8 +879,8 @@ class ListWrapper {
 >  : ^^^
 >from : number
 >     : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >to : number
 >   : ^^^^^^
 
@@ -1153,14 +1153,14 @@ let cloned = ListWrapper.clone(ListWrapper, [1,2,3,4]);
 >            : ^^^^^^^^^^^^^^^^^^
 >[1,2,3,4] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 declare function isBlank(x: any): boolean;
 >isBlank : (x: any) => boolean
diff --git a/tests/baselines/reference/staticGetterAndSetter.types b/tests/baselines/reference/staticGetterAndSetter.types
index c7eb080ea62..2e982e68aca 100644
--- a/tests/baselines/reference/staticGetterAndSetter.types
+++ b/tests/baselines/reference/staticGetterAndSetter.types
@@ -8,8 +8,8 @@ class Foo {
     static get Foo():number { return 0; }
 >Foo : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     static set Foo(n: number) {}
 >Foo : number
diff --git a/tests/baselines/reference/staticIndexSignature1.types b/tests/baselines/reference/staticIndexSignature1.types
index 6e2623e202f..3df7f2d9c77 100644
--- a/tests/baselines/reference/staticIndexSignature1.types
+++ b/tests/baselines/reference/staticIndexSignature1.types
@@ -15,28 +15,28 @@ class C {
 }
 
 C["foo"] = 1
->C["foo"] = 1 : number
->             : ^^^^^^
+>C["foo"] = 1 : 1
+>             : ^
 >C["foo"] : number
 >         : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >"foo" : "foo"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 C.bar = 2;
->C.bar = 2 : number
->          : ^^^^^^
+>C.bar = 2 : 2
+>          : ^
 >C.bar : number
 >      : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >bar : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 const foo = C["foo"]
 >foo : number
diff --git a/tests/baselines/reference/staticIndexSignature2.types b/tests/baselines/reference/staticIndexSignature2.types
index e830ea4589d..a0a3f6fb202 100644
--- a/tests/baselines/reference/staticIndexSignature2.types
+++ b/tests/baselines/reference/staticIndexSignature2.types
@@ -15,28 +15,28 @@ class C {
 }
 
 C["foo"] = 1
->C["foo"] = 1 : number
->             : ^^^^^^
+>C["foo"] = 1 : 1
+>             : ^
 >C["foo"] : number
 >         : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >"foo" : "foo"
 >      : ^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 C.bar = 2;
->C.bar = 2 : number
->          : ^^^^^^
+>C.bar = 2 : 2
+>          : ^
 >C.bar : number
 >      : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >bar : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 const foo = C["foo"]
 >foo : number
diff --git a/tests/baselines/reference/staticIndexSignature6.types b/tests/baselines/reference/staticIndexSignature6.types
index 03aed7347d8..e003edd6cb4 100644
--- a/tests/baselines/reference/staticIndexSignature6.types
+++ b/tests/baselines/reference/staticIndexSignature6.types
@@ -44,16 +44,16 @@ C.a;
 >  : ^^^^^^
 
 C.a = 1;
->C.a = 1 : number
->        : ^^^^^^
+>C.a = 1 : 1
+>        : ^
 >C.a : number
 >    : ^^^^^^
 >C : typeof (Anonymous class)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 C[2];
 >C[2] : 42
@@ -92,6 +92,6 @@ c.foo(1);
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : (v: number) => number
 >    : ^ ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/staticInstanceResolution3.types b/tests/baselines/reference/staticInstanceResolution3.types
index 5eeba2cdb1f..d754fd8474a 100644
--- a/tests/baselines/reference/staticInstanceResolution3.types
+++ b/tests/baselines/reference/staticInstanceResolution3.types
@@ -19,8 +19,8 @@ WinJS.Promise.timeout(10);
 >        : ^^^^^^^^^^^^^^^^^^^^
 >timeout : (delay: number) => WinJS.Promise
 >        : ^     ^^      ^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 === staticInstanceResolution3_0.ts ===
 export class Promise {
diff --git a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.types b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.types
index f6394d5c626..b672a7c564e 100644
--- a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.types
+++ b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.types
@@ -69,11 +69,11 @@ class C {
 >                 : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         return 1;
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/staticPropSuper.types b/tests/baselines/reference/staticPropSuper.types
index c626ceb8efd..f94a9813d08 100644
--- a/tests/baselines/reference/staticPropSuper.types
+++ b/tests/baselines/reference/staticPropSuper.types
@@ -15,8 +15,8 @@ class B extends A {
     public static s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor() {
         var x = 1; // should not error
@@ -42,8 +42,8 @@ class C extends A {
     public p: number = 10;
 >p : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     constructor() {
         var x = 1; // should error
@@ -63,8 +63,8 @@ class D extends A {
     private p: number = 11;
 >p : number
 >  : ^^^^^^
->11 : number
->   : ^^^^^^
+>11 : 11
+>   : ^^
 
     constructor() {
         var x = 1; // should error
@@ -84,8 +84,8 @@ class E extends A {
     p: number = 12;
 >p : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     constructor() {
         var x = 1; // should error
diff --git a/tests/baselines/reference/staticPropertyNotInClassType.types b/tests/baselines/reference/staticPropertyNotInClassType.types
index ef32ced0b6d..09a48bbc5b1 100644
--- a/tests/baselines/reference/staticPropertyNotInClassType.types
+++ b/tests/baselines/reference/staticPropertyNotInClassType.types
@@ -56,10 +56,10 @@ module NonGeneric {
 >            : ^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
     var r = c.fn();
 >r : C
@@ -159,10 +159,10 @@ module Generic {
 >             : ^^^^^^^^^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
     var r = c.fn();
 >r : C<number, string>
diff --git a/tests/baselines/reference/staticVisibility.types b/tests/baselines/reference/staticVisibility.types
index 01b678218bc..c042b79c272 100644
--- a/tests/baselines/reference/staticVisibility.types
+++ b/tests/baselines/reference/staticVisibility.types
@@ -102,8 +102,8 @@ class C2 {
 barback:string = "";
 >barback : string
 >        : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
  
 
 
@@ -111,8 +111,8 @@ barback:string = "";
 static get Bar() {return "bar";} // ok
 >Bar : string
 >    : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
  
 static set Bar(bar:string) {barback = bar;} // not ok
 >Bar : string
diff --git a/tests/baselines/reference/statics.types b/tests/baselines/reference/statics.types
index 2e71d50cb8b..12ef6cb4eb4 100644
--- a/tests/baselines/reference/statics.types
+++ b/tests/baselines/reference/statics.types
@@ -229,12 +229,12 @@ module M {
 >             : ^
 >C : typeof C
 >  : ^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >x : number
 >  : ^^^^^^
 
@@ -253,8 +253,8 @@ module M {
 >  : ^^^^^^^^
 >f : (n: number) => string
 >  : ^ ^^      ^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         result+=(new C(5,10,20).g(C.y));
 >result+=(new C(5,10,20).g(C.y)) : string
@@ -271,12 +271,12 @@ module M {
 >               : ^
 >C : typeof C
 >  : ^^^^^^^^
->5 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>5 : 5
+>  : ^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 >g : any
 >  : ^^^
 >C.y : number
diff --git a/tests/baselines/reference/strictBindCallApply1.types b/tests/baselines/reference/strictBindCallApply1.types
index c85635af109..ff2f612e1ca 100644
--- a/tests/baselines/reference/strictBindCallApply1.types
+++ b/tests/baselines/reference/strictBindCallApply1.types
@@ -54,8 +54,8 @@ let f01 = foo.bind(undefined, 10);
 >     : ^^^ ^^    ^^ ^^       ^^                    ^^^                    ^^^ ^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                     ^^       ^^ ^^^^^    ^^ ^^^                 ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let f02 = foo.bind(undefined, 10, "hello");
 >f02 : () => string
@@ -70,10 +70,10 @@ let f02 = foo.bind(undefined, 10, "hello");
 >     : ^^^ ^^    ^^ ^^       ^^                    ^^^                    ^^^ ^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                     ^^       ^^ ^^^^^    ^^ ^^^                 ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let f03 = foo.bind(undefined, 10, 20);  // Error
 >f03 : () => string
@@ -88,10 +88,10 @@ let f03 = foo.bind(undefined, 10, 20);  // Error
 >     : ^^^ ^^    ^^ ^^       ^^                    ^^^                    ^^^ ^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                     ^^       ^^ ^^^^^    ^^ ^^^                 ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let f04 = overloaded.bind(undefined);  // typeof overloaded
 >f04 : { (s: string): number; (n: number): string; }
@@ -134,10 +134,10 @@ let c00 = foo.call(undefined, 10, "hello");
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let c01 = foo.call(undefined, 10);  // Error
 >c01 : string
@@ -152,8 +152,8 @@ let c01 = foo.call(undefined, 10);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let c02 = foo.call(undefined, 10, 20);  // Error
 >c02 : string
@@ -168,10 +168,10 @@ let c02 = foo.call(undefined, 10, 20);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let c03 = foo.call(undefined, 10, "hello", 30);  // Error
 >c03 : string
@@ -186,12 +186,12 @@ let c03 = foo.call(undefined, 10, "hello", 30);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
->30 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>30 : 30
+>   : ^^
 
 let a00 = foo.apply(undefined, [10, "hello"]);
 >a00 : string
@@ -208,10 +208,10 @@ let a00 = foo.apply(undefined, [10, "hello"]);
 >          : ^^^^^^^^^
 >[10, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let a01 = foo.apply(undefined, [10]);  // Error
 >a01 : string
@@ -228,8 +228,8 @@ let a01 = foo.apply(undefined, [10]);  // Error
 >          : ^^^^^^^^^
 >[10] : [number]
 >     : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let a02 = foo.apply(undefined, [10, 20]);  // Error
 >a02 : string
@@ -246,10 +246,10 @@ let a02 = foo.apply(undefined, [10, 20]);  // Error
 >          : ^^^^^^^^^
 >[10, 20] : [number, number]
 >         : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let a03 = foo.apply(undefined, [10, "hello", 30]);  // Error
 >a03 : string
@@ -266,10 +266,10 @@ let a03 = foo.apply(undefined, [10, "hello", 30]);  // Error
 >          : ^^^^^^^^^
 >[10, "hello", 30] : [number, string, number]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >30 : 30
 >   : ^^
 
@@ -292,8 +292,8 @@ class C {
 >  : ^^^^^^
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     overloaded(s: string): number;
 >overloaded : { (s: string): number; (n: number): string; }
@@ -369,8 +369,8 @@ let f11 = c.foo.bind(c, 10);
 >     : ^^^ ^^    ^^ ^^       ^^                    ^^^                    ^^^ ^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                     ^^       ^^ ^^^^^    ^^ ^^^                 ^^^
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let f12 = c.foo.bind(c, 10, "hello");
 >f12 : () => string
@@ -389,10 +389,10 @@ let f12 = c.foo.bind(c, 10, "hello");
 >     : ^^^ ^^    ^^ ^^       ^^                    ^^^                    ^^^ ^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                     ^^       ^^ ^^^^^    ^^ ^^^                 ^^^
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let f13 = c.foo.bind(c, 10, 20);  // Error
 >f13 : () => string
@@ -411,10 +411,10 @@ let f13 = c.foo.bind(c, 10, 20);  // Error
 >     : ^^^ ^^    ^^ ^^       ^^                    ^^^                    ^^^ ^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                     ^^       ^^ ^^^^^    ^^ ^^^                 ^^^
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let f14 = c.foo.bind(undefined);  // Error
 >f14 : (a: number, b: string) => string
@@ -487,10 +487,10 @@ let c10 = c.foo.call(c, 10, "hello");
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let c11 = c.foo.call(c, 10);  // Error
 >c11 : string
@@ -509,8 +509,8 @@ let c11 = c.foo.call(c, 10);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let c12 = c.foo.call(c, 10, 20);  // Error
 >c12 : string
@@ -529,10 +529,10 @@ let c12 = c.foo.call(c, 10, 20);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let c13 = c.foo.call(c, 10, "hello", 30);  // Error
 >c13 : string
@@ -551,12 +551,12 @@ let c13 = c.foo.call(c, 10, "hello", 30);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
->30 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>30 : 30
+>   : ^^
 
 let c14 = c.foo.call(undefined, 10, "hello");  // Error
 >c14 : string
@@ -575,10 +575,10 @@ let c14 = c.foo.call(undefined, 10, "hello");  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^ ^^    ^^                          ^^       ^^ ^^^^^    ^^ ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let a10 = c.foo.apply(c, [10, "hello"]);
 >a10 : string
@@ -599,10 +599,10 @@ let a10 = c.foo.apply(c, [10, "hello"]);
 >  : ^
 >[10, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let a11 = c.foo.apply(c, [10]);  // Error
 >a11 : string
@@ -623,8 +623,8 @@ let a11 = c.foo.apply(c, [10]);  // Error
 >  : ^
 >[10] : [number]
 >     : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let a12 = c.foo.apply(c, [10, 20]);  // Error
 >a12 : string
@@ -645,10 +645,10 @@ let a12 = c.foo.apply(c, [10, 20]);  // Error
 >  : ^
 >[10, 20] : [number, number]
 >         : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 let a13 = c.foo.apply(c, [10, "hello", 30]);  // Error
 >a13 : string
@@ -669,10 +669,10 @@ let a13 = c.foo.apply(c, [10, "hello", 30]);  // Error
 >  : ^
 >[10, "hello", 30] : [number, string, number]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >30 : 30
 >   : ^^
 
@@ -695,10 +695,10 @@ let a14 = c.foo.apply(undefined, [10, "hello"]);  // Error
 >          : ^^^^^^^^^
 >[10, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let f20 = C.bind(undefined);
 >f20 : typeof C
@@ -727,8 +727,8 @@ let f21 = C.bind(undefined, 10);
 >     : ^^^ ^^    ^^ ^^       ^^   ^^^ ^^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                ^^       ^^   ^^^^^    ^^ ^^^                     ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 let f22 = C.bind(undefined, 10, "hello");
 >f22 : new () => C
@@ -743,10 +743,10 @@ let f22 = C.bind(undefined, 10, "hello");
 >     : ^^^ ^^    ^^ ^^       ^^   ^^^ ^^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                ^^       ^^   ^^^^^    ^^ ^^^                     ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let f23 = C.bind(undefined, 10, 20);  // Error
 >f23 : new () => C
@@ -761,10 +761,10 @@ let f23 = C.bind(undefined, 10, 20);  // Error
 >     : ^^^ ^^    ^^ ^^       ^^   ^^^ ^^^ ^^^^^^^^^     ^^ ^^^^^^^^^     ^^ ^^    ^^                                ^^       ^^   ^^^^^    ^^ ^^^                     ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 C.call(c, 10, "hello");
 >C.call(c, 10, "hello") : void
@@ -777,10 +777,10 @@ C.call(c, 10, "hello");
 >     : ^ ^^ ^^^^^^^^^     ^^    ^^                     ^^       ^^ ^^^^^    ^^ ^^^^^    
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 C.call(c, 10);  // Error
 >C.call(c, 10) : void
@@ -793,8 +793,8 @@ C.call(c, 10);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^    ^^                     ^^       ^^ ^^^^^    ^^ ^^^^^    
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 C.call(c, 10, 20);  // Error
 >C.call(c, 10, 20) : void
@@ -807,10 +807,10 @@ C.call(c, 10, 20);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^    ^^                     ^^       ^^ ^^^^^    ^^ ^^^^^    
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 C.call(c, 10, "hello", 30);  // Error
 >C.call(c, 10, "hello", 30) : void
@@ -823,12 +823,12 @@ C.call(c, 10, "hello", 30);  // Error
 >     : ^ ^^ ^^^^^^^^^     ^^    ^^                     ^^       ^^ ^^^^^    ^^ ^^^^^    
 >c : C
 >  : ^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
->30 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>30 : 30
+>   : ^^
 
 C.apply(c, [10, "hello"]);
 >C.apply(c, [10, "hello"]) : void
@@ -843,10 +843,10 @@ C.apply(c, [10, "hello"]);
 >  : ^
 >[10, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 C.apply(c, [10]);  // Error
 >C.apply(c, [10]) : void
@@ -861,8 +861,8 @@ C.apply(c, [10]);  // Error
 >  : ^
 >[10] : [number]
 >     : ^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 C.apply(c, [10, 20]);  // Error
 >C.apply(c, [10, 20]) : void
@@ -877,10 +877,10 @@ C.apply(c, [10, 20]);  // Error
 >  : ^
 >[10, 20] : [number, number]
 >         : ^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
 
 C.apply(c, [10, "hello", 30]);  // Error
 >C.apply(c, [10, "hello", 30]) : void
@@ -895,10 +895,10 @@ C.apply(c, [10, "hello", 30]);  // Error
 >  : ^
 >[10, "hello", 30] : [number, string, number]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>10 : 10
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >30 : 30
 >   : ^^
 
diff --git a/tests/baselines/reference/strictBindCallApply2.types b/tests/baselines/reference/strictBindCallApply2.types
index bb62435f47c..ca6d694a05b 100644
--- a/tests/baselines/reference/strictBindCallApply2.types
+++ b/tests/baselines/reference/strictBindCallApply2.types
@@ -34,6 +34,6 @@ const fb = fn.bind({ blub: "blub" });
 >                 : ^^^^^^^^^^^^^^^^^
 >blub : string
 >     : ^^^^^^
->"blub" : string
+>"blub" : "blub"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/strictModeInConstructor.types b/tests/baselines/reference/strictModeInConstructor.types
index d6321635555..26eaafa7b45 100644
--- a/tests/baselines/reference/strictModeInConstructor.types
+++ b/tests/baselines/reference/strictModeInConstructor.types
@@ -17,8 +17,8 @@ class B extends A {
     public s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor () {
         "use strict";   // No error
@@ -42,8 +42,8 @@ class C extends A {
     public s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor () {
         super();            // No error
@@ -67,8 +67,8 @@ class D extends A {
     public s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor () {
         var x = 1; // No error
@@ -108,8 +108,8 @@ class Bs extends A {
     public static s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor () {
         "use strict";   // No error
@@ -133,8 +133,8 @@ class Cs extends A {
     public static s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor () {
         super();            // No error
@@ -158,8 +158,8 @@ class Ds extends A {
     public static s: number = 9;
 >s : number
 >  : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 
     constructor () {
         var x = 1; // no Error
diff --git a/tests/baselines/reference/strictNullLogicalAndOr.types b/tests/baselines/reference/strictNullLogicalAndOr.types
index 6494dc89228..df52abfb5fa 100644
--- a/tests/baselines/reference/strictNullLogicalAndOr.types
+++ b/tests/baselines/reference/strictNullLogicalAndOr.types
@@ -91,6 +91,6 @@ sq(3);
 >      : ^^^^^^
 >sq : (n?: number) => number
 >   : ^ ^^^      ^^^^^      
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/strictOptionalProperties1.types b/tests/baselines/reference/strictOptionalProperties1.types
index 2c374c321e5..6407140da10 100644
--- a/tests/baselines/reference/strictOptionalProperties1.types
+++ b/tests/baselines/reference/strictOptionalProperties1.types
@@ -32,28 +32,28 @@ function f1(obj: { a?: string, b?: string | undefined }) {
 >  : ^^^^^^^^^^^^^^^^^^
 
     obj.a = 'hello';
->obj.a = 'hello' : string
->                : ^^^^^^
+>obj.a = 'hello' : "hello"
+>                : ^^^^^^^
 >obj.a : string
 >      : ^^^^^^
 >obj : { a?: string; b?: string | undefined; }
 >    : ^^^^^^      ^^^^^^                  ^^^
 >a : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
     obj.b = 'hello';
->obj.b = 'hello' : string
->                : ^^^^^^
+>obj.b = 'hello' : "hello"
+>                : ^^^^^^^
 >obj.b : string | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >obj : { a?: string; b?: string | undefined; }
 >    : ^^^^^^      ^^^^^^                  ^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
     obj.a = undefined;  // Error
 >obj.a = undefined : undefined
@@ -399,28 +399,28 @@ function f3(obj: Partial<{ a: string, b: string | undefined }>) {
 >  : ^^^^^^^^^^^^^^^^^^
 
     obj.a = 'hello';
->obj.a = 'hello' : string
->                : ^^^^^^
+>obj.a = 'hello' : "hello"
+>                : ^^^^^^^
 >obj.a : string
 >      : ^^^^^^
 >obj : Partial<{ a: string; b: string | undefined; }>
 >    : ^^^^^^^^^^^^^      ^^^^^                  ^^^^
 >a : string
 >  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
     obj.b = 'hello';
->obj.b = 'hello' : string
->                : ^^^^^^
+>obj.b = 'hello' : "hello"
+>                : ^^^^^^^
 >obj.b : string | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >obj : Partial<{ a: string; b: string | undefined; }>
 >    : ^^^^^^^^^^^^^      ^^^^^                  ^^^^
 >b : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
     obj.a = undefined;  // Error
 >obj.a = undefined : undefined
@@ -464,16 +464,16 @@ function f4(t: [string?]) {
 >  : ^
 
     t[0] = 'hello';
->t[0] = 'hello' : string
->               : ^^^^^^
+>t[0] = 'hello' : "hello"
+>               : ^^^^^^^
 >t[0] : string
 >     : ^^^^^^
 >t : [string?]
 >  : ^^^^^^^^^
 >0 : 0
 >  : ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
     t[0] = undefined;  // Error
 >t[0] = undefined : undefined
@@ -518,8 +518,8 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42] : [number]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     t = [42, 'abc'];
 >t = [42, 'abc'] : [number, string]
@@ -528,10 +528,10 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42, 'abc'] : [number, string]
 >            : ^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>42 : 42
+>   : ^^
+>'abc' : "abc"
+>      : ^^^^^
 
     t = [42, 'abc', true];
 >t = [42, 'abc', true] : [number, string, true]
@@ -540,10 +540,10 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42, 'abc', true] : [number, string, true]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>42 : 42
+>   : ^^
+>'abc' : "abc"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -554,8 +554,8 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42, ,] : [number, never?]
 >        : ^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 > : undefined
 > : ^^^^^^^^^
 
@@ -566,8 +566,8 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42, , ,] : [number, never?, never?]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 > : undefined
 > : ^^^^^^^^^
 > : undefined
@@ -580,8 +580,8 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42, , , ,] : [number, never?, never?, never?]
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 > : undefined
 > : ^^^^^^^^^
 > : undefined
@@ -610,8 +610,8 @@ function f5(t: [number, string?, boolean?]) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[42, undefined, true] : [number, undefined, true]
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >undefined : undefined
 >          : ^^^^^^^^^
 >true : true
@@ -730,8 +730,8 @@ const defaultProps: Pick<Props, 'foo'> = { foo: 'foo' };
 >               : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 const inputProps: InputProps = { foo: undefined, bar: 'bar' };
 >inputProps : InputProps
@@ -744,8 +744,8 @@ const inputProps: InputProps = { foo: undefined, bar: 'bar' };
 >          : ^^^^^^^^^
 >bar : string
 >    : ^^^^^^
->'bar' : string
->      : ^^^^^^
+>'bar' : "bar"
+>      : ^^^^^
 
 const completeProps: Props = { ...defaultProps, ...inputProps };
 >completeProps : Props
@@ -764,16 +764,16 @@ const t1: [number, string?, boolean?] = [1];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const t2: [number, string?, boolean?] = [1, undefined];
 >t2 : [number, string?, boolean?]
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, undefined] : [number, undefined]
 >               : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -782,10 +782,10 @@ const t3: [number, string?, boolean?] = [1, "string", undefined];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, "string", undefined] : [number, string, undefined]
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -794,8 +794,8 @@ const t4: [number, string?, boolean?] = [1, undefined, undefined];
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, undefined, undefined] : [number, undefined, undefined]
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 >undefined : undefined
@@ -824,8 +824,8 @@ const y: { foo: number } = { foo: 123, ...x };
 >                   : ^^^^^^^      ^^^
 >foo : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 >x : { foo?: number; }
 >  : ^^^^^^^^      ^^^
 
@@ -1060,8 +1060,8 @@ function expectNotUndefined<T>(value: Undefinable<T>): T {
 >                                    : ^^^^^^^^^
 >TypeError : TypeErrorConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->'value is undefined' : string
->                     : ^^^^^^
+>'value is undefined' : "value is undefined"
+>                     : ^^^^^^^^^^^^^^^^^^^^
     }
     return value;
 >value : T & ({} | null)
@@ -1174,8 +1174,8 @@ u2 = {
     name: 'hi',
 >name : string
 >     : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
     email: undefined
 >email : undefined
diff --git a/tests/baselines/reference/strictPropertyInitialization.types b/tests/baselines/reference/strictPropertyInitialization.types
index a4c76dc0df0..a028ba04609 100644
--- a/tests/baselines/reference/strictPropertyInitialization.types
+++ b/tests/baselines/reference/strictPropertyInitialization.types
@@ -117,14 +117,14 @@ class C4 {
     b: number = 0;
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     c: string = "abc";
 >c : string
 >  : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
     #d = 0
 >#d : number
@@ -135,14 +135,14 @@ class C4 {
     #e: number = 0
 >#e : number
 >   : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     #f: string= "abc"
 >#f : string
 >   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 }
 
 // Assignment in constructor satisfies strict initialization check
@@ -161,26 +161,26 @@ class C5 {
 
     constructor() {
         this.a = 0;
->this.a = 0 : number
->           : ^^^^^^
+>this.a = 0 : 0
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.#b = 0;
->this.#b = 0 : number
->            : ^^^^^^
+>this.#b = 0 : 0
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
@@ -209,26 +209,26 @@ class C6 {
             return;
         }
         this.a = 0;
->this.a = 0 : number
->           : ^^^^^^
+>this.a = 0 : 0
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.#b = 0;
->this.#b = 0 : number
->            : ^^^^^^
+>this.#b = 0 : 0
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
 
@@ -253,50 +253,50 @@ class C7 {
 >     : ^^^^^^^
 
             this.a = 1;
->this.a = 1 : number
->           : ^^^^^^
+>this.a = 1 : 1
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             this.#b = 1;
->this.#b = 1 : number
->            : ^^^^^^
+>this.#b = 1 : 1
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
             return;
         }
         this.a = 0;
->this.a = 0 : number
->           : ^^^^^^
+>this.a = 0 : 0
+>           : ^
 >this.a : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         this.#b = 1;
->this.#b = 1 : number
->            : ^^^^^^
+>this.#b = 1 : 1
+>            : ^
 >this.#b : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -525,40 +525,40 @@ class C12 {
 
     constructor() {
         this[a] = 1;
->this[a] = 1 : number
->            : ^^^^^^
+>this[a] = 1 : 1
+>            : ^
 >this[a] : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >a : "a"
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this[b] = 1;
->this[b] = 1 : number
->            : ^^^^^^
+>this[b] = 1 : 1
+>            : ^
 >this[b] : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >b : unique symbol
 >  : ^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
         this['c'] = 1;
->this['c'] = 1 : number
->              : ^^^^^^
+>this['c'] = 1 : 1
+>              : ^
 >this['c'] : number
 >          : ^^^^^^
 >this : this
 >     : ^^^^
 >'c' : "c"
 >    : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -594,8 +594,8 @@ class C13 {
 
     constructor() {
         this[E.A] = 1;
->this[E.A] = 1 : number
->              : ^^^^^^
+>this[E.A] = 1 : 1
+>              : ^
 >this[E.A] : number
 >          : ^^^^^^
 >this : this
@@ -606,8 +606,8 @@ class C13 {
 >  : ^^^^^^^^
 >A : E.A
 >  : ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/strictSubtypeAndNarrowing.types b/tests/baselines/reference/strictSubtypeAndNarrowing.types
index 4bde7ba3442..c6182b8e834 100644
--- a/tests/baselines/reference/strictSubtypeAndNarrowing.types
+++ b/tests/baselines/reference/strictSubtypeAndNarrowing.types
@@ -434,12 +434,12 @@ function fx10(obj1: { x?: number }, obj2: { x?: number, y?: number }) {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     obj2 = obj1 = { x: 1, y: 2 };
 >obj2 = obj1 = { x: 1, y: 2 } : { x: number; y: number; }
@@ -454,8 +454,8 @@ function fx10(obj1: { x?: number }, obj2: { x?: number, y?: number }) {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
 >2 : 2
@@ -485,12 +485,12 @@ function fx11(): { x?: number } {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 
 // Repros from #52827
diff --git a/tests/baselines/reference/strictTypeofUnionNarrowing.types b/tests/baselines/reference/strictTypeofUnionNarrowing.types
index d84beb532e9..cf3e155c899 100644
--- a/tests/baselines/reference/strictTypeofUnionNarrowing.types
+++ b/tests/baselines/reference/strictTypeofUnionNarrowing.types
@@ -28,8 +28,8 @@ function stringify1(anything: { toString(): string } | undefined): string {
 >         : ^^^^^^
 >toUpperCase : () => string
 >            : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function stringify2(anything: {} | undefined): string {
@@ -57,8 +57,8 @@ function stringify2(anything: {} | undefined): string {
 >         : ^^^^^^
 >toUpperCase : () => string
 >            : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function stringify3(anything: unknown | undefined): string { // should simplify to just `unknown` which should narrow fine
@@ -86,8 +86,8 @@ function stringify3(anything: unknown | undefined): string { // should simplify
 >         : ^^^^^^
 >toUpperCase : () => string
 >            : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function stringify4(anything: { toString?(): string } | undefined): string {
@@ -117,7 +117,7 @@ function stringify4(anything: { toString?(): string } | undefined): string {
 >         : ^^^^^^
 >toUpperCase : () => string
 >            : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/stringEnumLiteralTypes1.types b/tests/baselines/reference/stringEnumLiteralTypes1.types
index ee43fdec0fe..740c8eed83b 100644
--- a/tests/baselines/reference/stringEnumLiteralTypes1.types
+++ b/tests/baselines/reference/stringEnumLiteralTypes1.types
@@ -318,8 +318,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function f10(x: YesNo) {
diff --git a/tests/baselines/reference/stringEnumLiteralTypes2.types b/tests/baselines/reference/stringEnumLiteralTypes2.types
index 26e1d5eef7f..7ca1f635ada 100644
--- a/tests/baselines/reference/stringEnumLiteralTypes2.types
+++ b/tests/baselines/reference/stringEnumLiteralTypes2.types
@@ -318,8 +318,8 @@ function assertNever(x: never): never {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"Unexpected value" : string
->                   : ^^^^^^
+>"Unexpected value" : "Unexpected value"
+>                   : ^^^^^^^^^^^^^^^^^^
 }
 
 function f10(x: YesNo) {
diff --git a/tests/baselines/reference/stringIncludes.types b/tests/baselines/reference/stringIncludes.types
index 280e5cfe527..3e9ab6771c1 100644
--- a/tests/baselines/reference/stringIncludes.types
+++ b/tests/baselines/reference/stringIncludes.types
@@ -18,8 +18,8 @@ includes = "abcde".includes("cd");
 >        : ^^^^^^^
 >includes : (searchString: string, position?: number) => boolean
 >         : ^            ^^      ^^        ^^^      ^^^^^       
->"cd" : string
->     : ^^^^^^
+>"cd" : "cd"
+>     : ^^^^
 
 includes = "abcde".includes("cd", 2);
 >includes = "abcde".includes("cd", 2) : boolean
@@ -34,8 +34,8 @@ includes = "abcde".includes("cd", 2);
 >        : ^^^^^^^
 >includes : (searchString: string, position?: number) => boolean
 >         : ^            ^^      ^^        ^^^      ^^^^^       
->"cd" : string
->     : ^^^^^^
->2 : number
->  : ^^^^^^
+>"cd" : "cd"
+>     : ^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt
index 0d2af86da90..7c541e62554 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt
@@ -22,12 +22,13 @@ stringIndexerConstrainsPropertyDeclarations.ts(74,5): error TS2411: Property 'f'
 stringIndexerConstrainsPropertyDeclarations.ts(80,5): error TS2322: Type 'number' is not assignable to type 'string'.
 stringIndexerConstrainsPropertyDeclarations.ts(81,5): error TS2322: Type '() => void' is not assignable to type 'string'.
 stringIndexerConstrainsPropertyDeclarations.ts(83,5): error TS2322: Type 'number' is not assignable to type 'string'.
+stringIndexerConstrainsPropertyDeclarations.ts(85,5): error TS2322: Type 'number' is not assignable to type 'string'.
 stringIndexerConstrainsPropertyDeclarations.ts(87,5): error TS2322: Type 'number' is not assignable to type 'string'.
 stringIndexerConstrainsPropertyDeclarations.ts(88,5): error TS2322: Type 'MyString' is not assignable to type 'string'.
 stringIndexerConstrainsPropertyDeclarations.ts(94,5): error TS2322: Type '() => string' is not assignable to type 'string'.
 
 
-==== stringIndexerConstrainsPropertyDeclarations.ts (27 errors) ====
+==== stringIndexerConstrainsPropertyDeclarations.ts (28 errors) ====
     // String indexer types constrain the types of named properties in their containing type
     
     interface MyString extends String {
@@ -164,6 +165,9 @@ stringIndexerConstrainsPropertyDeclarations.ts(94,5): error TS2322: Type '() =>
 !!! related TS6501 stringIndexerConstrainsPropertyDeclarations.ts:78:10: The expected type comes from this index signature.
         1.0: '',
         2.0: 1, 
+        ~~~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6501 stringIndexerConstrainsPropertyDeclarations.ts:78:10: The expected type comes from this index signature.
         "3.0": '', 
         "4.0": 1, 
         ~~~~~
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
index e53da75f9ad..2067571b6f9 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
@@ -229,14 +229,14 @@ var b: { [x: string]: string; } = {
     a: '',
 >a : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     b: 1, 
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     c: () => { }, 
 >c : () => void
@@ -247,38 +247,38 @@ var b: { [x: string]: string; } = {
     "d": '', 
 >"d" : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     "e": 1, 
 >"e" : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     1.0: '',
 >1.0 : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     2.0: 1, 
 >2.0 : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     "3.0": '', 
 >"3.0" : string
 >      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     "4.0": 1, 
 >"4.0" : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     f: <MyString>null, 
 >f : MyString
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types
index b416b9c97a3..e4246e13ad8 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types
@@ -10,8 +10,8 @@ class A {
     foo(): string { return ''; }
 >foo : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class B extends A {
@@ -23,8 +23,8 @@ class B extends A {
     bar(): string { return ''; }
 >bar : () => string
 >    : ^^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
 class Foo {
diff --git a/tests/baselines/reference/stringIndexingResults.types b/tests/baselines/reference/stringIndexingResults.types
index a32cd4fb06c..b9796b6959d 100644
--- a/tests/baselines/reference/stringIndexingResults.types
+++ b/tests/baselines/reference/stringIndexingResults.types
@@ -146,8 +146,8 @@ var b: { [x: string]: string } = { y: '' }
 >          : ^^^^^^^^^^^^^^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r10 = b['y'];
 >r10 : string
diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
index 6fd9c7e1381..e213cc53d8b 100644
--- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
+++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
@@ -14,14 +14,14 @@ var x = {'text\
 >        : ^^^^^^^
 
 x.text = "bar"
->x.text = "bar" : string
->               : ^^^^^^
+>x.text = "bar" : "bar"
+>               : ^^^^^
 >x.text : string
 >       : ^^^^^^
 >x : { text: string; }
 >  : ^^^^^^^^^^^^^^^^^
 >text : string
 >     : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.types b/tests/baselines/reference/stringLiteralTypesAsTags01.types
index 90d67501141..823444d6677 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags01.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.types
@@ -91,8 +91,8 @@ let x: A = {
     a: 100,
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 if (hasKind(x, "A")) {
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.types b/tests/baselines/reference/stringLiteralTypesAsTags02.types
index c4ecbe8a532..7be84adf903 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags02.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags02.types
@@ -83,8 +83,8 @@ let x: A = {
     a: 100,
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 if (hasKind(x, "A")) {
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.types b/tests/baselines/reference/stringLiteralTypesAsTags03.types
index 97eec06c519..23f7ee69b06 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags03.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags03.types
@@ -87,8 +87,8 @@ let x: A = {
     a: 100,
 >a : number
 >  : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 }
 
 if (hasKind(x, "A")) {
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types
index ada17e77027..a78ede5477a 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types
@@ -14,8 +14,8 @@ function f(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function g(x: "bar"): number;
@@ -31,8 +31,8 @@ function g(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 let a = f;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types
index 285216ee517..f2f9f27f10b 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types
@@ -14,8 +14,8 @@ function f(x: "foo"): number {
 >  : ^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function g(x: "bar"): number;
@@ -31,8 +31,8 @@ function g(x: "bar"): number {
 >  : ^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 let a = f;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types
index 7e116fc24b8..af6e09d3b59 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types
@@ -14,8 +14,8 @@ function f(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function g(x: "foo"): number;
@@ -31,8 +31,8 @@ function g(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 let a = f;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types
index cb13ad73830..58b0a7133b8 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types
@@ -14,8 +14,8 @@ function f(x: "foo"): number {
 >  : ^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function g(x: "foo"): number;
@@ -31,8 +31,8 @@ function g(x: "foo"): number {
 >  : ^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 let a = f;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types
index 011a58eb683..589f600be16 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types
@@ -20,8 +20,8 @@ function f(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function g(x: "foo"): number;
@@ -37,8 +37,8 @@ function g(x: string): number {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 let a = f;
diff --git a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons01.types b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons01.types
index f87fcd08c4d..767bb603bc8 100644
--- a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons01.types
+++ b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons01.types
@@ -10,8 +10,8 @@ var a = "foo" === "bar" as string;
 >      : ^^^^^
 >"bar" as string : string
 >                : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var b = "foo" !== ("bar" as string);
 >b : boolean
@@ -24,8 +24,8 @@ var b = "foo" !== ("bar" as string);
 >                  : ^^^^^^
 >"bar" as string : string
 >                : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var c = "foo" == (<any>"bar");
 >c : boolean
diff --git a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types
index 84966bc6b06..d80efb312ef 100644
--- a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types
+++ b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types
@@ -44,8 +44,8 @@ var c = "foo" == (<number>"bar");
 >                : ^^^^^^
 ><number>"bar" : number
 >              : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 var d = "foo" === ("bar" as EnhancedString);
 >d : boolean
diff --git a/tests/baselines/reference/stringPropertyAccess.types b/tests/baselines/reference/stringPropertyAccess.types
index fcf787cd167..ee950ddfbe7 100644
--- a/tests/baselines/reference/stringPropertyAccess.types
+++ b/tests/baselines/reference/stringPropertyAccess.types
@@ -18,8 +18,8 @@ var a = x.charAt(0);
 >  : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var b = x.hasOwnProperty('charAt');
 >b : boolean
@@ -46,8 +46,8 @@ var c = x['charAt'](0);
 >  : ^^^^^^
 >'charAt' : "charAt"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var e = x['hasOwnProperty']('toFixed');
 >e : boolean
diff --git a/tests/baselines/reference/stringPropertyAccessWithError.types b/tests/baselines/reference/stringPropertyAccessWithError.types
index 0f81861b359..25f517cb294 100644
--- a/tests/baselines/reference/stringPropertyAccessWithError.types
+++ b/tests/baselines/reference/stringPropertyAccessWithError.types
@@ -18,6 +18,6 @@ var d = x['charAt']('invalid'); // error
 >  : ^^^^^^
 >'charAt' : "charAt"
 >         : ^^^^^^^^
->'invalid' : string
->          : ^^^^^^
+>'invalid' : "invalid"
+>          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringRawType.types b/tests/baselines/reference/stringRawType.types
index b96c4d87bf2..b29e37ccaa6 100644
--- a/tests/baselines/reference/stringRawType.types
+++ b/tests/baselines/reference/stringRawType.types
@@ -16,12 +16,12 @@ String.raw({ raw: ["foo", "bar", "baz"] }, 1, 2);
 >    : ^^^^^^^^
 >["foo", "bar", "baz"] : string[]
 >                      : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
->"bar" : string
->      : ^^^^^^
->"baz" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"bar" : "bar"
+>      : ^^^^^
+>"baz" : "baz"
+>      : ^^^^^
 >1 : 1
 >  : ^
 >2 : 2
diff --git a/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=false).types b/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=false).types
index 32fae530b29..f9ec5d0a58c 100644
--- a/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=false).types
+++ b/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=false).types
@@ -23,8 +23,8 @@ someVal.fn("");
 >        : ^^^^^^^^^^^^^^^   ^^      ^^^             ^^^^
 >fn : (key: string) => string | null
 >   : ^   ^^      ^^^^^             
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 declare const someVal2: Required<{
 >someVal2 : Required<{ fn?: (key: string) => string | null; }>
@@ -46,6 +46,6 @@ someVal2.fn("");
 >         : ^^^^^^^^^^^^^^^^                              ^^^^
 >fn : (key: string) => string | null
 >   : ^   ^^      ^^^^^             
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=true).types b/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=true).types
index 32fae530b29..f9ec5d0a58c 100644
--- a/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=true).types
+++ b/tests/baselines/reference/stripMembersOptionality(exactoptionalpropertytypes=true).types
@@ -23,8 +23,8 @@ someVal.fn("");
 >        : ^^^^^^^^^^^^^^^   ^^      ^^^             ^^^^
 >fn : (key: string) => string | null
 >   : ^   ^^      ^^^^^             
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 declare const someVal2: Required<{
 >someVal2 : Required<{ fn?: (key: string) => string | null; }>
@@ -46,6 +46,6 @@ someVal2.fn("");
 >         : ^^^^^^^^^^^^^^^^                              ^^^^
 >fn : (key: string) => string | null
 >   : ^   ^^      ^^^^^             
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types
index 6db3c59cfe8..20e0945add2 100644
--- a/tests/baselines/reference/structural1.types
+++ b/tests/baselines/reference/structural1.types
@@ -31,11 +31,11 @@ module M {
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >salt : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >pepper : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
diff --git a/tests/baselines/reference/subtypeRelationForNever.types b/tests/baselines/reference/subtypeRelationForNever.types
index 0e9bb46e779..8067b8d6487 100644
--- a/tests/baselines/reference/subtypeRelationForNever.types
+++ b/tests/baselines/reference/subtypeRelationForNever.types
@@ -50,8 +50,8 @@ function withFew<a, r>(values: a[], haveFew: (values: a[]) => r, haveNone: (reas
 >                       : ^
 >haveNone : (reason: string) => r
 >         : ^      ^^      ^^^^^ 
->'No values.' : string
->             : ^^^^^^
+>'No values.' : "No values."
+>             : ^^^^^^^^^^^^
 }
 function id<a>(value: a) : a { return value; }
 >id : <a>(value: a) => a
@@ -70,12 +70,12 @@ const result = withFew([1, 2, 3], id, fail); // expected result is number[]
 >        : ^ ^^ ^^      ^^   ^^       ^^                  ^^        ^^                     ^^^^^ 
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >id : <a>(value: a) => a
 >   : ^ ^^     ^^ ^^^^^ 
 >fail : (message: string) => never
diff --git a/tests/baselines/reference/subtypingTransitivity.types b/tests/baselines/reference/subtypingTransitivity.types
index 81bcd8d73ff..0519668c3de 100644
--- a/tests/baselines/reference/subtypingTransitivity.types
+++ b/tests/baselines/reference/subtypingTransitivity.types
@@ -44,16 +44,16 @@ var d2: D2;
 >   : ^^
 
 d.x = '';
->d.x = '' : string
->         : ^^^^^^
+>d.x = '' : ""
+>         : ^^
 >d.x : string
 >    : ^^^^^^
 >d : D
 >  : ^
 >x : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 b = d;
 >b = d : D
diff --git a/tests/baselines/reference/subtypingWithCallSignaturesA.types b/tests/baselines/reference/subtypingWithCallSignaturesA.types
index 24593eb51e2..53953823f42 100644
--- a/tests/baselines/reference/subtypingWithCallSignaturesA.types
+++ b/tests/baselines/reference/subtypingWithCallSignaturesA.types
@@ -22,6 +22,6 @@ var r5 = foo3((x: number) => ''); // error
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/superAccess.types b/tests/baselines/reference/superAccess.types
index 3e87cb29516..5e2106258b2 100644
--- a/tests/baselines/reference/superAccess.types
+++ b/tests/baselines/reference/superAccess.types
@@ -8,13 +8,13 @@ class MyBase {
     static S1: number = 5;
 >S1 : number
 >   : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
     private S2: string = "test";
 >S2 : string
 >   : ^^^^^^
->"test" : string
+>"test" : "test"
 >       : ^^^^^^
 
     f = () => 5;
diff --git a/tests/baselines/reference/superCallArgsMustMatch.types b/tests/baselines/reference/superCallArgsMustMatch.types
index 78317707926..d5fa4681db0 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.types
+++ b/tests/baselines/reference/superCallArgsMustMatch.types
@@ -32,8 +32,8 @@ class T6 extends T5<number>{
 >            : ^^^^
 >super : typeof T5
 >      : ^^^^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
         var x: number = this.foo;
 >x : number
diff --git a/tests/baselines/reference/superCallInNonStaticMethod.types b/tests/baselines/reference/superCallInNonStaticMethod.types
index 24fd586ad6e..78cd26b126a 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.types
+++ b/tests/baselines/reference/superCallInNonStaticMethod.types
@@ -111,8 +111,8 @@ class Other extends Doing {
 >               : ^^^^^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     // in a setter
diff --git a/tests/baselines/reference/superCallInStaticMethod.types b/tests/baselines/reference/superCallInStaticMethod.types
index 3e41c18159a..54b43e87fa4 100644
--- a/tests/baselines/reference/superCallInStaticMethod.types
+++ b/tests/baselines/reference/superCallInStaticMethod.types
@@ -111,8 +111,8 @@ class Other extends Doing {
 >             : ^^^^^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     // in a setter
diff --git a/tests/baselines/reference/superCalls.types b/tests/baselines/reference/superCalls.types
index 062705add7b..4d589be9c8a 100644
--- a/tests/baselines/reference/superCalls.types
+++ b/tests/baselines/reference/superCalls.types
@@ -38,8 +38,8 @@ class Derived extends Base {
 >          : ^^^^
 >super : typeof Base
 >      : ^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         //type of super call expression is void
         var p = super('');
@@ -49,8 +49,8 @@ class Derived extends Base {
 >          : ^^^^
 >super : typeof Base
 >      : ^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         var p = v();
 >p : void
diff --git a/tests/baselines/reference/superElementAccess.types b/tests/baselines/reference/superElementAccess.types
index 5cdffff5693..80aa6983493 100644
--- a/tests/baselines/reference/superElementAccess.types
+++ b/tests/baselines/reference/superElementAccess.types
@@ -26,20 +26,20 @@ class MyBase {
     d1: number = 42;
 >d1 : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     private d2: number = 42;
 >d2 : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     get value() {return 0 }
 >value : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set value(v: number) { }
 >value : number
@@ -68,8 +68,8 @@ class MyDerived extends MyBase {
 >      : ^^^^^^
 >"m1" : "m1"
 >     : ^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
         var l2 = super["m1"].bind(this);                       // Should be allowed, can access properties as well as invoke
 >l2 : any
@@ -157,20 +157,20 @@ class MyDerived extends MyBase {
 >                                    : ^ ^^      ^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         super["value"] = 0;                                    // Should error, instance data property not a public instance member function
->super["value"] = 0 : number
->                   : ^^^^^^
+>super["value"] = 0 : 0
+>                   : ^
 >super["value"] : number
 >               : ^^^^^^
 >super : MyBase
 >      : ^^^^^^
 >"value" : "value"
 >        : ^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         
         var z = super["value"];                                // Should error, instance data property not a public instance member function
 >z : number
diff --git a/tests/baselines/reference/superErrors.types b/tests/baselines/reference/superErrors.types
index d13f2a44586..749d4be7827 100644
--- a/tests/baselines/reference/superErrors.types
+++ b/tests/baselines/reference/superErrors.types
@@ -52,8 +52,8 @@ class User {
     name: string = "Bob";
 >name : string
 >     : ^^^^^^
->"Bob" : string
->      : ^^^^^^
+>"Bob" : "Bob"
+>      : ^^^^^
 
     sayHello(): void {
 >sayHello : () => void
@@ -72,8 +72,8 @@ class RegisteredUser extends User {
     name: string = "Frank";
 >name : string
 >     : ^^^^^^
->"Frank" : string
->        : ^^^^^^
+>"Frank" : "Frank"
+>        : ^^^^^^^
 
     constructor() {
         super();
diff --git a/tests/baselines/reference/superInConstructorParam1.types b/tests/baselines/reference/superInConstructorParam1.types
index 427a3ec4a88..4b673b11b2e 100644
--- a/tests/baselines/reference/superInConstructorParam1.types
+++ b/tests/baselines/reference/superInConstructorParam1.types
@@ -10,8 +10,8 @@ class B {
 >    : ^^^^^^      
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
   }
 }
 
diff --git a/tests/baselines/reference/superInLambdas.types b/tests/baselines/reference/superInLambdas.types
index f74fc792bed..dd99d71f2cb 100644
--- a/tests/baselines/reference/superInLambdas.types
+++ b/tests/baselines/reference/superInLambdas.types
@@ -8,8 +8,8 @@ class User {
     name: string = "Bob";
 >name : string
 >     : ^^^^^^
->"Bob" : string
->      : ^^^^^^
+>"Bob" : "Bob"
+>      : ^^^^^
 
     sayHello(): void {
 >sayHello : () => void
@@ -28,8 +28,8 @@ class RegisteredUser extends User {
     name: string = "Frank";
 >name : string
 >     : ^^^^^^
->"Frank" : string
->        : ^^^^^^
+>"Frank" : "Frank"
+>        : ^^^^^^^
 
     constructor() {
         super();
@@ -104,8 +104,8 @@ class RegisteredUser2 extends User {
     name: string = "Joe";
 >name : string
 >     : ^^^^^^
->"Joe" : string
->      : ^^^^^^
+>"Joe" : "Joe"
+>      : ^^^^^
 
     constructor() {
         super();
@@ -167,8 +167,8 @@ class RegisteredUser3 extends User {
     name: string = "Sam";
 >name : string
 >     : ^^^^^^
->"Sam" : string
->      : ^^^^^^
+>"Sam" : "Sam"
+>      : ^^^^^
 
     constructor() {
         super();
@@ -226,7 +226,7 @@ class RegisteredUser4 extends User {
     name: string = "Mark";
 >name : string
 >     : ^^^^^^
->"Mark" : string
+>"Mark" : "Mark"
 >       : ^^^^^^
 
     constructor() {
diff --git a/tests/baselines/reference/superPropertyAccess.types b/tests/baselines/reference/superPropertyAccess.types
index ef7f57fb7cf..3ce3267ade1 100644
--- a/tests/baselines/reference/superPropertyAccess.types
+++ b/tests/baselines/reference/superPropertyAccess.types
@@ -26,20 +26,20 @@ class MyBase {
     d1: number = 42;
 >d1 : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     private d2: number = 42;
 >d2 : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     get value() {return 0 }
 >value : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     set value(v: number) { }
 >value : number
@@ -68,8 +68,8 @@ class MyDerived extends MyBase {
 >      : ^^^^^^
 >m1 : (a: string) => string
 >   : ^ ^^      ^^^^^^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
         var l2 = super.m1.bind(this);                       // Should be allowed, can access properties as well as invoke
 >l2 : any
@@ -160,20 +160,20 @@ class MyDerived extends MyBase {
 >                                    : ^ ^^      ^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         super.value = 0;                                    // Should error, instance data property not a public instance member function
->super.value = 0 : number
->                : ^^^^^^
+>super.value = 0 : 0
+>                : ^
 >super.value : number
 >            : ^^^^^^
 >super : MyBase
 >      : ^^^^^^
 >value : number
 >      : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         
         var z = super.value;                                // Should error, instance data property not a public instance member function
 >z : number
diff --git a/tests/baselines/reference/superPropertyAccessInSuperCall01.types b/tests/baselines/reference/superPropertyAccessInSuperCall01.types
index af9430f8750..9873094c380 100644
--- a/tests/baselines/reference/superPropertyAccessInSuperCall01.types
+++ b/tests/baselines/reference/superPropertyAccessInSuperCall01.types
@@ -12,8 +12,8 @@ class A {
 	public blah(): string { return ""; }
 >blah : () => string
 >     : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class B extends A {
diff --git a/tests/baselines/reference/superPropertyAccess_ES5.types b/tests/baselines/reference/superPropertyAccess_ES5.types
index ce9bf80c6e0..e18478006e2 100644
--- a/tests/baselines/reference/superPropertyAccess_ES5.types
+++ b/tests/baselines/reference/superPropertyAccess_ES5.types
@@ -8,14 +8,14 @@ class MyBase {
   getValue(): number { return 1; }
 >getValue : () => number
 >         : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   get value(): number { return 1; }
 >value : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 class MyDerived extends MyBase {
diff --git a/tests/baselines/reference/superPropertyAccess_ES6.types b/tests/baselines/reference/superPropertyAccess_ES6.types
index 012274b7aa3..4fa6d804dc4 100644
--- a/tests/baselines/reference/superPropertyAccess_ES6.types
+++ b/tests/baselines/reference/superPropertyAccess_ES6.types
@@ -8,14 +8,14 @@ class MyBase {
   getValue(): number { return 1; }
 >getValue : () => number
 >         : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
   get value(): number { return 1; }
 >value : number
 >      : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 class MyDerived extends MyBase {
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.types b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.types
index bd932bcac79..d7849841a7a 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.types
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.types
@@ -12,8 +12,8 @@ class B {
     x(): string { return ""; }
 >x : () => string
 >  : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 class C1 extends B {
 >C1 : C1
diff --git a/tests/baselines/reference/superSymbolIndexedAccess1.types b/tests/baselines/reference/superSymbolIndexedAccess1.types
index 12bab229809..122a3be1e87 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess1.types
+++ b/tests/baselines/reference/superSymbolIndexedAccess1.types
@@ -12,8 +12,8 @@ var symbol = Symbol.for('myThing');
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->'myThing' : string
->          : ^^^^^^
+>'myThing' : "myThing"
+>          : ^^^^^^^^^
 
 class Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/superSymbolIndexedAccess3.types b/tests/baselines/reference/superSymbolIndexedAccess3.types
index d84c77fbd30..d730df25494 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess3.types
+++ b/tests/baselines/reference/superSymbolIndexedAccess3.types
@@ -12,8 +12,8 @@ var symbol = Symbol.for('myThing');
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->'myThing' : string
->          : ^^^^^^
+>'myThing' : "myThing"
+>          : ^^^^^^^^^
 
 class Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/superSymbolIndexedAccess4.types b/tests/baselines/reference/superSymbolIndexedAccess4.types
index 72978be21c7..9299444b543 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess4.types
+++ b/tests/baselines/reference/superSymbolIndexedAccess4.types
@@ -12,8 +12,8 @@ var symbol = Symbol.for('myThing');
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->'myThing' : string
->          : ^^^^^^
+>'myThing' : "myThing"
+>          : ^^^^^^^^^
 
 class Bar {
 >Bar : Bar
diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types
index 3c82b25cf87..4128bc51aea 100644
--- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types
+++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types
@@ -71,8 +71,8 @@ class F { public test(): string { return ""; } }
 >  : ^
 >test : () => string
 >     : ^^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 class SuperObjectTest extends F {
 >SuperObjectTest : SuperObjectTest
diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types
index 8688fd56649..b1ccea30718 100644
--- a/tests/baselines/reference/switchStatements.types
+++ b/tests/baselines/reference/switchStatements.types
@@ -47,8 +47,8 @@ switch (x) {
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     case new Object():
 >new Object() : Object
@@ -103,8 +103,8 @@ switch (x) {
 >  : ^^^^^^^^
 >fn : (x: number) => string
 >   : ^ ^^      ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     case <T>(x: number) => '':
 ><T>(x: number) => '' : <T>(x: number) => string
@@ -125,8 +125,8 @@ switch (x) {
 >  : ^^^^^^
 >'' : ""
 >   : ^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     default:
 }
@@ -199,8 +199,8 @@ switch (new Date(12)) { }
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 switch (new Object()) { }
 >new Object() : Object
@@ -253,8 +253,8 @@ switch ((<T>(x: T) => '')(1)) { }
 >  : ^
 >'' : ""
 >   : ^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
 
diff --git a/tests/baselines/reference/symbolProperty21.types b/tests/baselines/reference/symbolProperty21.types
index 616863a2138..12c806099fe 100644
--- a/tests/baselines/reference/symbolProperty21.types
+++ b/tests/baselines/reference/symbolProperty21.types
@@ -50,8 +50,8 @@ foo({
 >       : ^^^^^^^^^^^^^^^^^
 >isConcatSpreadable : unique symbol
 >                   : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     [Symbol.toPrimitive]: 0,
 >[Symbol.toPrimitive] : number
diff --git a/tests/baselines/reference/symbolProperty22.types b/tests/baselines/reference/symbolProperty22.types
index ec4a6efc5ed..6e95426ea4b 100644
--- a/tests/baselines/reference/symbolProperty22.types
+++ b/tests/baselines/reference/symbolProperty22.types
@@ -28,8 +28,8 @@ foo("", { [Symbol.unscopables]: s => s.length });
 >                                                 : ^^^^^^
 >foo : <T, U>(p1: T, p2: I<T, U>) => U
 >    : ^ ^^ ^^  ^^ ^^  ^^       ^^^^^ 
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >{ [Symbol.unscopables]: s => s.length } : { [Symbol.unscopables]: (s: string) => number; }
 >                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^
 >[Symbol.unscopables] : (s: string) => number
diff --git a/tests/baselines/reference/symbolProperty40.types b/tests/baselines/reference/symbolProperty40.types
index 5e256d4afc3..e23f4b0a85a 100644
--- a/tests/baselines/reference/symbolProperty40.types
+++ b/tests/baselines/reference/symbolProperty40.types
@@ -67,8 +67,8 @@ c[Symbol.iterator]("");
 >       : ^^^^^^^^^^^^^^^^^
 >iterator : unique symbol
 >         : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 c[Symbol.iterator](0);
 >c[Symbol.iterator](0) : number
@@ -83,6 +83,6 @@ c[Symbol.iterator](0);
 >       : ^^^^^^^^^^^^^^^^^
 >iterator : unique symbol
 >         : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/symbolProperty41.types b/tests/baselines/reference/symbolProperty41.types
index fb496585266..2af10a276c1 100644
--- a/tests/baselines/reference/symbolProperty41.types
+++ b/tests/baselines/reference/symbolProperty41.types
@@ -73,8 +73,8 @@ c[Symbol.iterator]("");
 >       : ^^^^^^^^^^^^^^^^^
 >iterator : unique symbol
 >         : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 c[Symbol.iterator]("hello");
 >c[Symbol.iterator]("hello") : { x: string; hello: string; }
diff --git a/tests/baselines/reference/symbolProperty46.types b/tests/baselines/reference/symbolProperty46.types
index 7af465f7d4b..28d3e0a044c 100644
--- a/tests/baselines/reference/symbolProperty46.types
+++ b/tests/baselines/reference/symbolProperty46.types
@@ -35,8 +35,8 @@ class C {
 }
 
 (new C)[Symbol.hasInstance] = 0;
->(new C)[Symbol.hasInstance] = 0 : number
->                                : ^^^^^^
+>(new C)[Symbol.hasInstance] = 0 : 0
+>                                : ^
 >(new C)[Symbol.hasInstance] : string
 >                            : ^^^^^^
 >(new C) : C
@@ -51,12 +51,12 @@ class C {
 >       : ^^^^^^^^^^^^^^^^^
 >hasInstance : unique symbol
 >            : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 (new C)[Symbol.hasInstance] = "";
->(new C)[Symbol.hasInstance] = "" : string
->                                 : ^^^^^^
+>(new C)[Symbol.hasInstance] = "" : ""
+>                                 : ^^
 >(new C)[Symbol.hasInstance] : string
 >                            : ^^^^^^
 >(new C) : C
@@ -71,6 +71,6 @@ class C {
 >       : ^^^^^^^^^^^^^^^^^
 >hasInstance : unique symbol
 >            : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/symbolProperty47.types b/tests/baselines/reference/symbolProperty47.types
index 8c2fa27d473..a2c795409f5 100644
--- a/tests/baselines/reference/symbolProperty47.types
+++ b/tests/baselines/reference/symbolProperty47.types
@@ -16,8 +16,8 @@ class C {
 >            : ^^^^^^^^^^^^^
 
         return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
     }
     // Should take a string
     set [Symbol.hasInstance](x: number) {
@@ -35,8 +35,8 @@ class C {
 }
 
 (new C)[Symbol.hasInstance] = 0;
->(new C)[Symbol.hasInstance] = 0 : number
->                                : ^^^^^^
+>(new C)[Symbol.hasInstance] = 0 : 0
+>                                : ^
 >(new C)[Symbol.hasInstance] : number
 >                            : ^^^^^^
 >(new C) : C
@@ -51,12 +51,12 @@ class C {
 >       : ^^^^^^^^^^^^^^^^^
 >hasInstance : unique symbol
 >            : ^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 (new C)[Symbol.hasInstance] = "";
->(new C)[Symbol.hasInstance] = "" : string
->                                 : ^^^^^^
+>(new C)[Symbol.hasInstance] = "" : ""
+>                                 : ^^
 >(new C)[Symbol.hasInstance] : number
 >                            : ^^^^^^
 >(new C) : C
@@ -71,6 +71,6 @@ class C {
 >       : ^^^^^^^^^^^^^^^^^
 >hasInstance : unique symbol
 >            : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/symbolProperty61.types b/tests/baselines/reference/symbolProperty61.types
index 0a26bce5fe4..cc91c95e629 100644
--- a/tests/baselines/reference/symbolProperty61.types
+++ b/tests/baselines/reference/symbolProperty61.types
@@ -120,6 +120,6 @@ from(new MyObservable(42))
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >MyObservable : typeof MyObservable
 >             : ^^^^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/symbolType10.types b/tests/baselines/reference/symbolType10.types
index 5696107a214..89fec70e62c 100644
--- a/tests/baselines/reference/symbolType10.types
+++ b/tests/baselines/reference/symbolType10.types
@@ -12,8 +12,8 @@ var s = Symbol.for("bitwise");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"bitwise" : string
->          : ^^^^^^
+>"bitwise" : "bitwise"
+>          : ^^^^^^^^^
 
 s & s;
 >s & s : number
diff --git a/tests/baselines/reference/symbolType11.types b/tests/baselines/reference/symbolType11.types
index 86a0db5e84e..3c61d14d9d1 100644
--- a/tests/baselines/reference/symbolType11.types
+++ b/tests/baselines/reference/symbolType11.types
@@ -12,8 +12,8 @@ var s = Symbol.for("logical");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"logical" : string
->          : ^^^^^^
+>"logical" : "logical"
+>          : ^^^^^^^^^
 
 s && s;
 >s && s : symbol
diff --git a/tests/baselines/reference/symbolType12.types b/tests/baselines/reference/symbolType12.types
index 5d034ffefb3..420a215e93d 100644
--- a/tests/baselines/reference/symbolType12.types
+++ b/tests/baselines/reference/symbolType12.types
@@ -12,8 +12,8 @@ var s = Symbol.for("assign");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"assign" : string
->         : ^^^^^^
+>"assign" : "assign"
+>         : ^^^^^^^^
 
 var str = "";
 >str : string
diff --git a/tests/baselines/reference/symbolType4.types b/tests/baselines/reference/symbolType4.types
index 520b980b6ea..bffbe5061d4 100644
--- a/tests/baselines/reference/symbolType4.types
+++ b/tests/baselines/reference/symbolType4.types
@@ -12,8 +12,8 @@ var s = Symbol.for("postfix");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"postfix" : string
->          : ^^^^^^
+>"postfix" : "postfix"
+>          : ^^^^^^^^^
 
 s++;
 >s++ : number
diff --git a/tests/baselines/reference/symbolType5.types b/tests/baselines/reference/symbolType5.types
index 17ad22f3206..2ffbe19c154 100644
--- a/tests/baselines/reference/symbolType5.types
+++ b/tests/baselines/reference/symbolType5.types
@@ -12,8 +12,8 @@ var s = Symbol.for("multiply");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"multiply" : string
->           : ^^^^^^
+>"multiply" : "multiply"
+>           : ^^^^^^^^^^
 
 s * s;
 >s * s : number
diff --git a/tests/baselines/reference/symbolType6.types b/tests/baselines/reference/symbolType6.types
index fcda4a45bd8..0679be8e342 100644
--- a/tests/baselines/reference/symbolType6.types
+++ b/tests/baselines/reference/symbolType6.types
@@ -12,8 +12,8 @@ var s = Symbol.for("add");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"add" : string
->      : ^^^^^^
+>"add" : "add"
+>      : ^^^^^
 
 var a: any;
 >a : any
diff --git a/tests/baselines/reference/symbolType7.types b/tests/baselines/reference/symbolType7.types
index 406d0d79e31..5659e1fe786 100644
--- a/tests/baselines/reference/symbolType7.types
+++ b/tests/baselines/reference/symbolType7.types
@@ -12,8 +12,8 @@ var s = Symbol.for("shift");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"shift" : string
->        : ^^^^^^
+>"shift" : "shift"
+>        : ^^^^^^^
 
 s << s;
 >s << s : number
diff --git a/tests/baselines/reference/symbolType8.types b/tests/baselines/reference/symbolType8.types
index 3427bae81a9..e102fc5781a 100644
--- a/tests/baselines/reference/symbolType8.types
+++ b/tests/baselines/reference/symbolType8.types
@@ -12,8 +12,8 @@ var s = Symbol.for("compare");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"compare" : string
->          : ^^^^^^
+>"compare" : "compare"
+>          : ^^^^^^^^^
 
 s < s;
 >s < s : boolean
diff --git a/tests/baselines/reference/symbolType9.types b/tests/baselines/reference/symbolType9.types
index a71ad27bcee..700f2d41d28 100644
--- a/tests/baselines/reference/symbolType9.types
+++ b/tests/baselines/reference/symbolType9.types
@@ -12,8 +12,8 @@ var s = Symbol.for("equal");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"equal" : string
->        : ^^^^^^
+>"equal" : "equal"
+>        : ^^^^^^^
 
 s == s;
 >s == s : boolean
diff --git a/tests/baselines/reference/syntaxErrors.types b/tests/baselines/reference/syntaxErrors.types
index f0ebbe58100..f7a1c4eaab4 100644
--- a/tests/baselines/reference/syntaxErrors.types
+++ b/tests/baselines/reference/syntaxErrors.types
@@ -61,6 +61,6 @@ var x = f({ t: 1000 }, { t: 3000 }, { t: 5000 });
 >            : ^^^^^^^^^^^^^^
 >t : number
 >  : ^^^^^^
->5000 : number
->     : ^^^^^^
+>5000 : 5000
+>     : ^^^^
 
diff --git a/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.types b/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.types
index 35dfcbafdb3..e56f972e46f 100644
--- a/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.types
+++ b/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.types
@@ -19,8 +19,8 @@ import("package").then(({default: foo}) => foo(42));
 >                       : ^        ^^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import("package") : Promise<{ default: (x: number) => string; }>
 >                  : ^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^^
->"package" : string
->          : ^^^^^^
+>"package" : "package"
+>          : ^^^^^^^^^
 >then : <TResult1 = { default: (x: number) => string; }, TResult2 = never>(onfulfilled?: (value: { default: (x: number) => string; }) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >     : ^        ^^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >({default: foo}) => foo(42) : ({ default: foo }: { default: (x: number) => string; }) => string
@@ -33,6 +33,6 @@ import("package").then(({default: foo}) => foo(42));
 >        : ^^^^^^
 >foo : (x: number) => string
 >    : ^ ^^      ^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
diff --git a/tests/baselines/reference/systemDefaultImportCallable.types b/tests/baselines/reference/systemDefaultImportCallable.types
index 532cdf94983..6763081fed5 100644
--- a/tests/baselines/reference/systemDefaultImportCallable.types
+++ b/tests/baselines/reference/systemDefaultImportCallable.types
@@ -67,6 +67,6 @@ const _: string = repeat(new Date().toUTCString() + " ", 2);
 >            : ^^^^^^      
 >" " : " "
 >    : ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/taggedPrimitiveNarrowing.types b/tests/baselines/reference/taggedPrimitiveNarrowing.types
index b743971bd6b..e2fdf7a4288 100644
--- a/tests/baselines/reference/taggedPrimitiveNarrowing.types
+++ b/tests/baselines/reference/taggedPrimitiveNarrowing.types
@@ -30,8 +30,8 @@ function getHashLength(hash: Hash): number {
 >                                           : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"This doesn't look like a hash" : string
->                                : ^^^^^^
+>"This doesn't look like a hash" : "This doesn't look like a hash"
+>                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
     return hash.length;
 >hash.length : number
@@ -65,8 +65,8 @@ function getHashLength2<T extends { __tag__: unknown}>(hash: string & T): number
 >                                           : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->"This doesn't look like a hash" : string
->                                : ^^^^^^
+>"This doesn't look like a hash" : "This doesn't look like a hash"
+>                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
     return hash.length;
 >hash.length : number
diff --git a/tests/baselines/reference/taggedTemplateContextualTyping2.types b/tests/baselines/reference/taggedTemplateContextualTyping2.types
index 67d34e794e2..3ee103c935e 100644
--- a/tests/baselines/reference/taggedTemplateContextualTyping2.types
+++ b/tests/baselines/reference/taggedTemplateContextualTyping2.types
@@ -77,8 +77,8 @@ tempTag2 `${ x => { x<number>(undefined); return x; }         }${ 0 }`;
 >          : ^^^^^^^^^
 >x : <T>(p: T) => T
 >  : ^ ^^ ^^ ^^^^^ 
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 tempTag2 `${ x => { x<number, string>(undefined); return x; } }${ y => { y<string, number>(null); return y; } }${ "hello" }`;
 >tempTag2 `${ x => { x<number, string>(undefined); return x; } }${ y => { y<string, number>(null); return y; } }${ "hello" }` : string
@@ -109,8 +109,8 @@ tempTag2 `${ x => { x<number, string>(undefined); return x; } }${ y => { y<strin
 >  : ^ ^^ ^^ ^^ ^^^^^ 
 >y : <S, T>(p: T) => T
 >  : ^ ^^ ^^ ^^ ^^^^^ 
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 tempTag2 `${ x => { x<number, string>(undefined); return x; } }${ undefined }${ "hello" }`;
 >tempTag2 `${ x => { x<number, string>(undefined); return x; } }${ undefined }${ "hello" }` : string
@@ -133,6 +133,6 @@ tempTag2 `${ x => { x<number, string>(undefined); return x; } }${ undefined }${
 >  : ^ ^^ ^^ ^^ ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types
index bd37ff05e6d..43d0210d7bd 100644
--- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types
+++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types
@@ -47,8 +47,8 @@ someGenerics1a `${3}`;
 >               : ^ ^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
 >`${3}` : string
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 function someGenerics1b<T, U>(n: TemplateStringsArray, m: U) { }
 >someGenerics1b : <T, U>(n: TemplateStringsArray, m: U) => void
@@ -65,8 +65,8 @@ someGenerics1b `${3}`;
 >               : ^ ^^ ^^ ^^                    ^^ ^^ ^^^^^^^^^
 >`${3}` : string
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // Generic tag with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(strs: TemplateStringsArray, n: (x: T) => void) { }
@@ -139,8 +139,8 @@ someGenerics3 `${() => ''}`;
 >              : ^^^^^^
 >() => '' : () => string
 >         : ^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 someGenerics3 `${() => undefined}`;
 >someGenerics3 `${() => undefined}` : void
@@ -163,8 +163,8 @@ someGenerics3 `${() => 3}`;
 >             : ^^^^^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // 2 parameter generic tag with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 function someGenerics4<T, U>(strs: TemplateStringsArray, n: T, f: (x: U) => void) { }
@@ -186,8 +186,8 @@ someGenerics4 `${4}${ () => null }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${4}${ () => null }` : string
 >                      : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -198,8 +198,8 @@ someGenerics4 `${''}${ () => 3 }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${''}${ () => 3 }` : string
 >                    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -233,8 +233,8 @@ someGenerics5 `${ 4 } ${ () => null }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${ 4 } ${ () => null }` : string
 >                         : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -245,8 +245,8 @@ someGenerics5 `${ '' }${ () => 3 }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${ '' }${ () => 3 }` : string
 >                      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -555,8 +555,8 @@ var a9e = someGenerics9 `${ undefined }${ { x: 6, z: new Date() } }${ { x: 6, y:
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Date
 >  : ^^^^
 >new Date() : Date
@@ -567,12 +567,12 @@ var a9e = someGenerics9 `${ undefined }${ { x: 6, z: new Date() } }${ { x: 6, y:
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9e: {};
 >a9e : { x: number; z: Date; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -592,20 +592,20 @@ var a9d = someGenerics9 `${ { x: 3 }}${ { x: 6 }}${ { x: 6 } }`;
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
 var a9d: { x: number; };
 >a9d : { x: number; }
diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types
index 0bd4cd3ff31..11154ecef18 100644
--- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types
@@ -47,8 +47,8 @@ someGenerics1a `${3}`;
 >               : ^ ^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
 >`${3}` : string
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 function someGenerics1b<T, U>(n: TemplateStringsArray, m: U) { }
 >someGenerics1b : <T, U>(n: TemplateStringsArray, m: U) => void
@@ -65,8 +65,8 @@ someGenerics1b `${3}`;
 >               : ^ ^^ ^^ ^^                    ^^ ^^ ^^^^^^^^^
 >`${3}` : string
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // Generic tag with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(strs: TemplateStringsArray, n: (x: T) => void) { }
@@ -139,8 +139,8 @@ someGenerics3 `${() => ''}`;
 >              : ^^^^^^
 >() => '' : () => string
 >         : ^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 someGenerics3 `${() => undefined}`;
 >someGenerics3 `${() => undefined}` : void
@@ -163,8 +163,8 @@ someGenerics3 `${() => 3}`;
 >             : ^^^^^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // 2 parameter generic tag with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 function someGenerics4<T, U>(strs: TemplateStringsArray, n: T, f: (x: U) => void) { }
@@ -186,8 +186,8 @@ someGenerics4 `${4}${ () => null }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${4}${ () => null }` : string
 >                      : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -198,8 +198,8 @@ someGenerics4 `${''}${ () => 3 }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${''}${ () => 3 }` : string
 >                    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -233,8 +233,8 @@ someGenerics5 `${ 4 } ${ () => null }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${ 4 } ${ () => null }` : string
 >                         : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -245,8 +245,8 @@ someGenerics5 `${ '' }${ () => 3 }`;
 >              : ^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^              ^^^^^^^^^
 >`${ '' }${ () => 3 }` : string
 >                      : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -555,8 +555,8 @@ var a9e = someGenerics9 `${ undefined }${ { x: 6, z: new Date() } }${ { x: 6, y:
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Date
 >  : ^^^^
 >new Date() : Date
@@ -567,12 +567,12 @@ var a9e = someGenerics9 `${ undefined }${ { x: 6, z: new Date() } }${ { x: 6, y:
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9e: {};
 >a9e : { x: number; z: Date; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -592,20 +592,20 @@ var a9d = someGenerics9 `${ { x: 3 }}${ { x: 6 }}${ { x: 6 } }`;
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
 var a9d: { x: number; };
 >a9d : { x: number; }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
index cf0f0113014..9c9367a4c7a 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
@@ -200,8 +200,8 @@ f.thisIsNotATag(`abc`);
 >  : ^
 >thisIsNotATag : (x: string) => void
 >              : ^ ^^      ^^^^^    
->`abc` : string
->      : ^^^^^^
+>`abc` : "abc"
+>      : ^^^^^
 
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 >f.thisIsNotATag(`abc${1}def${2}ghi`) : void
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
index 9f0758d34e4..1a9e3c90a65 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
@@ -200,8 +200,8 @@ f.thisIsNotATag(`abc`);
 >  : ^
 >thisIsNotATag : (x: string) => void
 >              : ^ ^^      ^^^^^    
->`abc` : string
->      : ^^^^^^
+>`abc` : "abc"
+>      : ^^^^^
 
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 >f.thisIsNotATag(`abc${1}def${2}ghi`) : void
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
index f959058fbe4..44e9c01c8d0 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
@@ -48,14 +48,14 @@ var x = new new new f `abc${ 0 }def`.member("hello")(42) === true;
 >  : ^
 >`abc${ 0 }def` : string
 >               : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >member : new (s: string) => { new (n: number): { new (): boolean; }; }
 >       : ^^^^^ ^^      ^^^^^                                          
->"hello" : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
index 6714f941804..9f1272dd163 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
@@ -48,14 +48,14 @@ var x = new new new f `abc${ 0 }def`.member("hello")(42) === true;
 >  : ^
 >`abc${ 0 }def` : string
 >               : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >member : new (s: string) => { new (n: number): { new (): boolean; }; }
 >       : ^^^^^ ^^      ^^^^^                                          
->"hello" : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 >true : true
 >     : ^^^^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types
index 25e5c94bcea..90d36c4a8dd 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types
@@ -65,8 +65,8 @@ var b = foo([], 1);          // string
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var c = foo([], 1, 2);       // boolean
 >c : never
@@ -77,10 +77,10 @@ var c = foo([], 1, 2);       // boolean
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var d = foo([], 1, true);    // boolean (with error)
 >d : never
@@ -91,8 +91,8 @@ var d = foo([], 1, true);    // boolean (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -105,10 +105,10 @@ var e = foo([], 1, "2");     // {}
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"2" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"2" : "2"
+>    : ^^^
 
 var f = foo([], 1, 2, 3);    // any (with error)
 >f : never
@@ -119,10 +119,10 @@ var f = foo([], 1, 2, 3);    // any (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -145,8 +145,8 @@ var v = foo `${1}`;          // string
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}` : string
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var w = foo `${1}${2}`;      // boolean
 >w : boolean
@@ -157,10 +157,10 @@ var w = foo `${1}${2}`;      // boolean
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${2}` : string
 >           : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var x = foo `${1}${true}`;   // boolean (with error)
 >x : never
@@ -171,8 +171,8 @@ var x = foo `${1}${true}`;   // boolean (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${true}` : string
 >              : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -185,10 +185,10 @@ var y = foo `${1}${"2"}`;    // {}
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${"2"}` : string
 >             : ^^^^^^
->1 : number
->  : ^^^^^^
->"2" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"2" : "2"
+>    : ^^^
 
 var z = foo `${1}${2}${3}`;  // any (with error)
 >z : never
@@ -199,10 +199,10 @@ var z = foo `${1}${2}${3}`;  // any (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${2}${3}` : string
 >               : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types
index 44d1483e3cd..393bdc10e5d 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types
@@ -65,8 +65,8 @@ var b = foo([], 1);          // string
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var c = foo([], 1, 2);       // boolean
 >c : never
@@ -77,10 +77,10 @@ var c = foo([], 1, 2);       // boolean
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var d = foo([], 1, true);    // boolean (with error)
 >d : never
@@ -91,8 +91,8 @@ var d = foo([], 1, true);    // boolean (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -105,10 +105,10 @@ var e = foo([], 1, "2");     // {}
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"2" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"2" : "2"
+>    : ^^^
 
 var f = foo([], 1, 2, 3);    // any (with error)
 >f : never
@@ -119,10 +119,10 @@ var f = foo([], 1, 2, 3);    // any (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -145,8 +145,8 @@ var v = foo `${1}`;          // string
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}` : string
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var w = foo `${1}${2}`;      // boolean
 >w : boolean
@@ -157,10 +157,10 @@ var w = foo `${1}${2}`;      // boolean
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${2}` : string
 >           : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 var x = foo `${1}${true}`;   // boolean (with error)
 >x : never
@@ -171,8 +171,8 @@ var x = foo `${1}${true}`;   // boolean (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${true}` : string
 >              : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -185,10 +185,10 @@ var y = foo `${1}${"2"}`;    // {}
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${"2"}` : string
 >             : ^^^^^^
->1 : number
->  : ^^^^^^
->"2" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>"2" : "2"
+>    : ^^^
 
 var z = foo `${1}${2}${3}`;  // any (with error)
 >z : never
@@ -199,10 +199,10 @@ var z = foo `${1}${2}${3}`;  // any (with error)
 >    : ^^^    ^^                    ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^       ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^  ^^^
 >`${1}${2}${3}` : string
 >               : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types
index c98e20e8528..f9a0ff44f08 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types
@@ -37,8 +37,8 @@ var a = foo1 `${1}`;
 >     : ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^        ^^ ^^      ^^^      ^^^
 >`${1}` : string
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var b = foo1([], 1);
 >b : number
@@ -49,8 +49,8 @@ var b = foo1([], 1);
 >     : ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^        ^^ ^^      ^^^      ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function foo2(strs: string[], x: number): number;
 >foo2 : { (strs: string[], x: number): number; (strs: TemplateStringsArray, x: number): string; }
@@ -88,8 +88,8 @@ var c = foo2 `${1}`;
 >     : ^^^    ^^        ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^
 >`${1}` : string
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var d = foo2([], 1);
 >d : number
@@ -100,6 +100,6 @@ var d = foo2([], 1);
 >     : ^^^    ^^        ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types
index e995e16b1c4..60bfa97beba 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types
@@ -37,8 +37,8 @@ var a = foo1 `${1}`;
 >     : ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^        ^^ ^^      ^^^      ^^^
 >`${1}` : string
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var b = foo1([], 1);
 >b : number
@@ -49,8 +49,8 @@ var b = foo1([], 1);
 >     : ^^^    ^^                    ^^ ^^      ^^^      ^^^    ^^        ^^ ^^      ^^^      ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 function foo2(strs: string[], x: number): number;
 >foo2 : { (strs: string[], x: number): number; (strs: TemplateStringsArray, x: number): string; }
@@ -88,8 +88,8 @@ var c = foo2 `${1}`;
 >     : ^^^    ^^        ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^
 >`${1}` : string
 >       : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var d = foo2([], 1);
 >d : number
@@ -100,6 +100,6 @@ var d = foo2([], 1);
 >     : ^^^    ^^        ^^ ^^      ^^^      ^^^    ^^                    ^^ ^^      ^^^      ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
index 56b76c8a465..630a467632c 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
@@ -80,8 +80,8 @@ var d1: Date = fn2 `${ 0 }${ undefined }`; // contextually typed
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ 0 }${ undefined }` : string
 >                       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -94,8 +94,8 @@ var d2       = fn2 `${ 0 }${ undefined }`; // any
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ 0 }${ undefined }` : string
 >                       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -123,8 +123,8 @@ fn2 `${ 0 }${ '' }`; // OK
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ 0 }${ '' }` : string
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -136,10 +136,10 @@ fn2 `${ '' }${ 0 }`; // OK
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ '' }${ 0 }` : string
 >                : ^^^^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic overloads with differing arity
 function fn3<T>(strs: TemplateStringsArray, n: T): string;
@@ -187,8 +187,8 @@ var s = fn3 `${ 3 }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ 3 }` : string
 >         : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var s = fn3 `${'' }${ 3 }${ '' }`;
 >s : string
@@ -199,10 +199,10 @@ var s = fn3 `${'' }${ 3 }${ '' }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${'' }${ 3 }${ '' }` : string
 >                      : ^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -215,12 +215,12 @@ var n = fn3 `${ 5 }${ 5 }${ 5 }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ 5 }${ 5 }${ 5 }` : string
 >                     : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 var n: number;
 >n : number
@@ -236,8 +236,8 @@ var s = fn3 `${ 4 }`
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ 4 }` : string
 >         : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var s = fn3 `${ '' }${ '' }${ '' }`;
 >s : string
@@ -248,10 +248,10 @@ var s = fn3 `${ '' }${ '' }${ '' }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ '' }${ '' }${ '' }` : string
 >                        : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 >'' : ""
 >   : ^^
 
@@ -264,10 +264,10 @@ var n = fn3 `${ '' }${ '' }${ 3 }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ '' }${ '' }${ 3 }` : string
 >                       : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 >3 : 3
 >  : ^
 
@@ -454,7 +454,7 @@ fn5 `${ (n) => n.substr(0) }`;
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
index 1b8b4f1ad07..0fe7c7d29a2 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
@@ -80,8 +80,8 @@ var d1: Date = fn2 `${ 0 }${ undefined }`; // contextually typed
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ 0 }${ undefined }` : string
 >                       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -94,8 +94,8 @@ var d2 = fn2 `${ 0 }${ undefined }`; // any
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ 0 }${ undefined }` : string
 >                       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -123,8 +123,8 @@ fn2 `${ 0 }${ '' }`; // OK
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ 0 }${ '' }` : string
 >                : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -136,10 +136,10 @@ fn2 `${ '' }${ 0 }`; // OK
 >    : ^^^    ^^                    ^^ ^^      ^^ ^^      ^^^      ^^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^^ ^^^
 >`${ '' }${ 0 }` : string
 >                : ^^^^^^
->'' : string
->   : ^^^^^^
->0 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>0 : 0
+>  : ^
 
 // Generic overloads with differing arity
 function fn3<T>(strs: TemplateStringsArray, n: T): string;
@@ -187,8 +187,8 @@ var s = fn3 `${ 3 }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ 3 }` : string
 >         : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var s = fn3 `${'' }${ 3 }${ '' }`;
 >s : string
@@ -199,10 +199,10 @@ var s = fn3 `${'' }${ 3 }${ '' }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${'' }${ 3 }${ '' }` : string
 >                      : ^^^^^^
->'' : string
->   : ^^^^^^
->3 : number
->  : ^^^^^^
+>'' : ""
+>   : ^^
+>3 : 3
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -215,12 +215,12 @@ var n = fn3 `${ 5 }${ 5 }${ 5 }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ 5 }${ 5 }${ 5 }` : string
 >                     : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 var n: number;
 >n : number
@@ -236,8 +236,8 @@ var s = fn3 `${ 4 }`
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ 4 }` : string
 >         : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 var s = fn3 `${ '' }${ '' }${ '' }`;
 >s : string
@@ -248,10 +248,10 @@ var s = fn3 `${ '' }${ '' }${ '' }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ '' }${ '' }${ '' }` : string
 >                        : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 >'' : ""
 >   : ^^
 
@@ -264,10 +264,10 @@ var n = fn3 `${ '' }${ '' }${ 3 }`;
 >    : ^^^ ^^    ^^                    ^^ ^^ ^^^      ^^^ ^^ ^^    ^^                    ^^ ^^      ^^ ^^ ^^ ^^ ^^^ ^^^ ^^ ^^ ^^    ^^                    ^^ ^^ ^^ ^^ ^^ ^^ ^^^      ^^^
 >`${ '' }${ '' }${ 3 }` : string
 >                       : ^^^^^^
->'' : string
->   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
+>'' : ""
+>   : ^^
 >3 : 3
 >  : ^
 
@@ -454,7 +454,7 @@ fn5 `${ (n) => n.substr(0) }`;
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types
index e792a77780b..1c6ec891335 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types
@@ -19,10 +19,10 @@ foo `${function (x: number) { x = "bad"; } }`;
 >                                    : ^ ^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->x = "bad" : string
->          : ^^^^^^
+>x = "bad" : "bad"
+>          : ^^^^^
 >x : number
 >  : ^^^^^^
->"bad" : string
->      : ^^^^^^
+>"bad" : "bad"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types
index 482c8ed8984..0074473a09f 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types
@@ -19,10 +19,10 @@ foo `${function (x: number) { x = "bad"; } }`;
 >                                    : ^ ^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->x = "bad" : string
->          : ^^^^^^
+>x = "bad" : "bad"
+>          : ^^^^^
 >x : number
 >  : ^^^^^^
->"bad" : string
->      : ^^^^^^
+>"bad" : "bad"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types
index 3c34bf5e7be..bc90d3b604e 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types
@@ -50,10 +50,10 @@ f `abc${1}def${2}ghi`;
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f `abc`.member
 >f `abc`.member : I
@@ -76,10 +76,10 @@ f `abc${1}def${2}ghi`.member;
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >member : I
 >       : ^
 
@@ -104,10 +104,10 @@ f `abc${1}def${2}ghi`["member"];
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >"member" : "member"
 >         : ^^^^^^^^
 
@@ -130,10 +130,10 @@ f `abc`[0].member `abc${1}def${2}ghi`;
 >       : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
 >f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi` : I
@@ -148,20 +148,20 @@ f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >"member" : "member"
 >         : ^^^^^^^^
 >member : I
 >       : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f.thisIsNotATag(`abc`);
 >f.thisIsNotATag(`abc`) : void
@@ -172,8 +172,8 @@ f.thisIsNotATag(`abc`);
 >  : ^
 >thisIsNotATag : (x: string) => void
 >              : ^ ^^      ^^^^^    
->`abc` : string
->      : ^^^^^^
+>`abc` : "abc"
+>      : ^^^^^
 
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 >f.thisIsNotATag(`abc${1}def${2}ghi`) : void
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types b/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types
index 7e5da8cd8b9..cb2cebbfeff 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types
@@ -50,10 +50,10 @@ f `abc${1}def${2}ghi`;
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f `abc`.member
 >f `abc`.member : I
@@ -76,10 +76,10 @@ f `abc${1}def${2}ghi`.member;
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >member : I
 >       : ^
 
@@ -104,10 +104,10 @@ f `abc${1}def${2}ghi`["member"];
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >"member" : "member"
 >         : ^^^^^^^^
 
@@ -130,10 +130,10 @@ f `abc`[0].member `abc${1}def${2}ghi`;
 >       : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
 >f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi` : I
@@ -148,20 +148,20 @@ f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
 >  : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >"member" : "member"
 >         : ^^^^^^^^
 >member : I
 >       : ^
 >`abc${1}def${2}ghi` : string
 >                    : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 f.thisIsNotATag(`abc`);
 >f.thisIsNotATag(`abc`) : void
@@ -172,8 +172,8 @@ f.thisIsNotATag(`abc`);
 >  : ^
 >thisIsNotATag : (x: string) => void
 >              : ^ ^^      ^^^^^    
->`abc` : string
->      : ^^^^^^
+>`abc` : "abc"
+>      : ^^^^^
 
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 >f.thisIsNotATag(`abc${1}def${2}ghi`) : void
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types
index 3ebfd8fd20d..0566bfc6376 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types
@@ -20,8 +20,8 @@ f `123qdawdrqw${ 1 }${
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`123qdawdrqw${ 1 }${ : string
 >                     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 > : any
 > : ^^^
 
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types
index 00511bb779e..ba73d02d975 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types
@@ -20,8 +20,8 @@ f `123qdawdrqw${ 1 }${ }${
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`123qdawdrqw${ 1 }${ }${ : string
 >                         : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 > : any
 > : ^^^
 > : any
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types
index e15599f344f..b29ccd370eb 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types
@@ -20,10 +20,10 @@ f `123qdawdrqw${ 1 }${ 2 }${
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`123qdawdrqw${ 1 }${ 2 }${ : string
 >                           : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 > : any
 > : ^^^
 
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types
index f2006c1147b..2ac78621f07 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types
@@ -20,8 +20,8 @@ f `123qdawdrqw${ 1 }${
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`123qdawdrqw${ 1 }${ : string
 >                     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 > : any
 > : ^^^
 
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
index 6b5633cd11b..3ed8436decb 100644
--- a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
@@ -30,14 +30,14 @@ const a = new tag `${100} ${200}`<string>("hello", "world");
 >    : ^^^^^^^^^^^^^^^^^
 >`${100} ${200}` : string
 >                : ^^^^^^
->100 : number
->    : ^^^^^^
->200 : number
->    : ^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
+>100 : 100
+>    : ^^^
+>200 : 200
+>    : ^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
 >b : any
@@ -50,14 +50,14 @@ const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
 >    : ^^^^^^^^^^^^^^^^^
 >`${"hello"} ${"world"}` : string
 >                        : ^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
->100 : number
->    : ^^^^^^
->200 : number
->    : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
+>100 : 100
+>    : ^^^
+>200 : 200
+>    : ^^^
 
 const c = new tag<number> `${100} ${200}`<string>("hello", "world");
 >c : any
@@ -70,14 +70,14 @@ const c = new tag<number> `${100} ${200}`<string>("hello", "world");
 >    : ^^^^^^^^^^^^^^^^^
 >`${100} ${200}` : string
 >                : ^^^^^^
->100 : number
->    : ^^^^^^
->200 : number
->    : ^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
+>100 : 100
+>    : ^^^
+>200 : 200
+>    : ^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
 >d : any
@@ -90,14 +90,14 @@ const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
 >    : ^^^^^^^^^^^^^^^^^
 >`${"hello"} ${"world"}` : string
 >                        : ^^^^^^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
->100 : number
->    : ^^^^^^
->200 : number
->    : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
+>100 : 100
+>    : ^^^
+>200 : 200
+>    : ^^^
 
 /**
  * Testing ASI. This should never parse as
diff --git a/tests/baselines/reference/targetTypeArgs.types b/tests/baselines/reference/targetTypeArgs.types
index 7ccc13b158f..654f04fe5a9 100644
--- a/tests/baselines/reference/targetTypeArgs.types
+++ b/tests/baselines/reference/targetTypeArgs.types
@@ -14,8 +14,8 @@ function foo(callback: (x: string) => void) {
 >                  : ^^^^
 >callback : (x: string) => void
 >         : ^ ^^      ^^^^^    
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 
 foo(function(x) { x });
diff --git a/tests/baselines/reference/targetTypeBaseCalls.types b/tests/baselines/reference/targetTypeBaseCalls.types
index 8d333e92879..496ddc1cd0b 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.types
+++ b/tests/baselines/reference/targetTypeBaseCalls.types
@@ -30,12 +30,12 @@ foo(function(s) { s = 5 });  // Error, can’t assign number to string
 >                      : ^ ^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->s = 5 : number
->      : ^^^^^^
+>s = 5 : 5
+>      : ^
 >s : string
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
  
  
  
@@ -48,12 +48,12 @@ new Foo(function(s) { s = 5 });  // error, if types are applied correctly
 >                      : ^ ^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->s = 5 : number
->      : ^^^^^^
+>s = 5 : 5
+>      : ^
 >s : string
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
  
  
  
@@ -70,10 +70,10 @@ class Bar extends Foo { constructor() { super(function(s) { s = 5 }) } }  // err
 >                      : ^ ^^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
->s = 5 : number
->      : ^^^^^^
+>s = 5 : 5
+>      : ^
 >s : string
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/targetTypeCalls.types b/tests/baselines/reference/targetTypeCalls.types
index c7c3689b7e2..38dbd4b9a0b 100644
--- a/tests/baselines/reference/targetTypeCalls.types
+++ b/tests/baselines/reference/targetTypeCalls.types
@@ -26,8 +26,8 @@ var fra2: (v:any)=>number = function() { return function () { return 0; } }() //
 >                                                : ^^^^^^^^^^^^^^^^^^
 >function () { return 0; } : () => number
 >                          : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var fra3: (v:any)=>string = function() { return function() { return function(v) {return v;};}(); }() // should work
 >fra3 : (v: any) => string
diff --git a/tests/baselines/reference/targetTypeCastTest.types b/tests/baselines/reference/targetTypeCastTest.types
index 6d7a265a3c9..ba0037ed8af 100644
--- a/tests/baselines/reference/targetTypeCastTest.types
+++ b/tests/baselines/reference/targetTypeCastTest.types
@@ -92,8 +92,8 @@ var add2: Adder2 = function(x,y) {
 >  : ^^^^^^
 
     return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function add3(x,y) {x}
diff --git a/tests/baselines/reference/targetTypeObjectLiteral.types b/tests/baselines/reference/targetTypeObjectLiteral.types
index 04bde15682b..4a792bd8d3b 100644
--- a/tests/baselines/reference/targetTypeObjectLiteral.types
+++ b/tests/baselines/reference/targetTypeObjectLiteral.types
@@ -16,8 +16,8 @@ var z: { x: number; y: (w:string)=>number;} = {
     x: 12,
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     y: function(w) {
 >y : (w: string) => number
@@ -28,8 +28,8 @@ var z: { x: number; y: (w:string)=>number;} = {
 >  : ^^^^^^
 
         return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     }
 
diff --git a/tests/baselines/reference/targetTypeTest1.types b/tests/baselines/reference/targetTypeTest1.types
index 7406aedc861..53c18513618 100644
--- a/tests/baselines/reference/targetTypeTest1.types
+++ b/tests/baselines/reference/targetTypeTest1.types
@@ -98,10 +98,10 @@ var x = EF1(1,2);
 >         : ^^^^^^
 >EF1 : (a: number, b: number) => number
 >    : ^ ^^      ^^ ^^      ^^^^^      
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 // Point.origin declared as type Point
 Point.origin = new Point(0, 0);
@@ -117,10 +117,10 @@ Point.origin = new Point(0, 0);
 >                : ^^^^^
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 // Point.prototype declared as type Point
 // this inferred as Point because of obj.prop assignment
@@ -176,8 +176,8 @@ Point.prototype.add = function(dx, dy) {
 var f : number = 5;
 >f : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 // Object literal type inferred using target typing
 // this in function add inferred to be type of object literal (i.e. Point)
@@ -197,14 +197,14 @@ Point.prototype = {
     x: 0,
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     y: 0,
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     add: function(dx, dy) {
 >add : (dx: number, dy: number) => Point
@@ -338,14 +338,14 @@ C.prototype =
 >                                                                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 		b:0, 
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 		C1M1: function(c,d) {     
 >C1M1 : (c: number, d: number) => any
diff --git a/tests/baselines/reference/targetTypeTest3.types b/tests/baselines/reference/targetTypeTest3.types
index 89a7d26b868..6c6603117a6 100644
--- a/tests/baselines/reference/targetTypeTest3.types
+++ b/tests/baselines/reference/targetTypeTest3.types
@@ -9,12 +9,12 @@ var a : string[] = [1,2,"3"]; // should produce an error
 >  : ^^^^^^^^
 >[1,2,"3"] : (string | number)[]
 >          : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"3" : string
->    : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"3" : "3"
+>    : ^^^
 
 
 function func1(stuff:any[]) { return stuff; }
diff --git a/tests/baselines/reference/templateExpressionNoInlininingOfConstantBindingWithInitializer.types b/tests/baselines/reference/templateExpressionNoInlininingOfConstantBindingWithInitializer.types
index 7954a229611..0a7fa7a227a 100644
--- a/tests/baselines/reference/templateExpressionNoInlininingOfConstantBindingWithInitializer.types
+++ b/tests/baselines/reference/templateExpressionNoInlininingOfConstantBindingWithInitializer.types
@@ -19,8 +19,8 @@ function example(parameters: Params) {
   const { value = '123' } = parameters
 >value : string | number
 >      : ^^^^^^^^^^^^^^^
->'123' : string
->      : ^^^^^^
+>'123' : "123"
+>      : ^^^^^
 >parameters : Params
 >           : ^^^^^^
 
@@ -44,8 +44,8 @@ function example2(parameters: Params) {
   const { value = '123' } = parameters
 >value : string | number
 >      : ^^^^^^^^^^^^^^^
->'123' : string
->      : ^^^^^^
+>'123' : "123"
+>      : ^^^^^
 >parameters : Params
 >           : ^^^^^^
 
diff --git a/tests/baselines/reference/templateLiteralIntersection4.types b/tests/baselines/reference/templateLiteralIntersection4.types
index b05544719d6..52c110bae89 100644
--- a/tests/baselines/reference/templateLiteralIntersection4.types
+++ b/tests/baselines/reference/templateLiteralIntersection4.types
@@ -50,14 +50,14 @@ const { Provider, useUsername, useAge, useStore } = createStore({
   username: "Aral",
 >username : string
 >         : ^^^^^^
->"Aral" : string
+>"Aral" : "Aral"
 >       : ^^^^^^
 
   age: 31
 >age : number
 >    : ^^^^^^
->31 : number
->   : ^^^^^^
+>31 : 31
+>   : ^^
 
 });
 
diff --git a/tests/baselines/reference/templateLiteralTypes2.types b/tests/baselines/reference/templateLiteralTypes2.types
index 9c99ab4ac5e..aa664dda404 100644
--- a/tests/baselines/reference/templateLiteralTypes2.types
+++ b/tests/baselines/reference/templateLiteralTypes2.types
@@ -369,8 +369,8 @@ function ft13(s: string, cond: boolean) {
 >                       : ^^^^^^
 >cond : boolean
 >     : ^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 >`foo${s}` : string
 >          : ^^^^^^
 >s : string
@@ -582,8 +582,8 @@ const t5 = takesLiteral(`foo.bar.${someUnion}`);  // "abc" | "def" | "ghi"
 const pixelValue: number = 22;
 >pixelValue : number
 >           : ^^^^^^
->22 : number
->   : ^^^^^^
+>22 : 22
+>   : ^^
 
 type PixelValueType = `${number}px`;
 >PixelValueType : `${number}px`
diff --git a/tests/baselines/reference/templateLiteralTypes3.types b/tests/baselines/reference/templateLiteralTypes3.types
index cc5545e1c44..655a8cee049 100644
--- a/tests/baselines/reference/templateLiteralTypes3.types
+++ b/tests/baselines/reference/templateLiteralTypes3.types
@@ -533,8 +533,8 @@ type Templated = `${string} ${string}`;
 const value1: string = "abc";
 >value1 : string
 >       : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 const templated1: Templated = `${value1} abc` as const;
 >templated1 : `${string} ${string}`
@@ -829,14 +829,14 @@ noSpread([`1.${'2' as string}.3`, `1.${'2' as string}.4`]);
 >                       : ^^^^^^^^^^^^^^^
 >'2' as string : string
 >              : ^^^^^^
->'2' : string
->    : ^^^^^^
+>'2' : "2"
+>    : ^^^
 >`1.${'2' as string}.4` : `1.${string}.4`
 >                       : ^^^^^^^^^^^^^^^
 >'2' as string : string
 >              : ^^^^^^
->'2' : string
->    : ^^^^^^
+>'2' : "2"
+>    : ^^^
 
 spread(`1.${'2'}.3`, `1.${'2'}.4`);
 >spread(`1.${'2'}.3`, `1.${'2'}.4`) : "1.2.3" | "1.2.4"
@@ -861,14 +861,14 @@ spread(`1.${'2' as string}.3`, `1.${'2' as string}.4`);
 >                       : ^^^^^^^^^^^^^^^
 >'2' as string : string
 >              : ^^^^^^
->'2' : string
->    : ^^^^^^
+>'2' : "2"
+>    : ^^^
 >`1.${'2' as string}.4` : `1.${string}.4`
 >                       : ^^^^^^^^^^^^^^^
 >'2' as string : string
 >              : ^^^^^^
->'2' : string
->    : ^^^^^^
+>'2' : "2"
+>    : ^^^
 
 function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>, u2: Uppercase<`1.${T}.4`>) {
 >ft1 : <T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>, u2: Uppercase<`1.${T}.4`>) => void
diff --git a/tests/baselines/reference/templateLiteralTypes4.types b/tests/baselines/reference/templateLiteralTypes4.types
index 394fdf3813c..ef54a53c3ef 100644
--- a/tests/baselines/reference/templateLiteralTypes4.types
+++ b/tests/baselines/reference/templateLiteralTypes4.types
@@ -722,8 +722,8 @@ p.setIndex(0, 0); // ok, 0 is a valid index
 >         : ^ ^^^^^^^^^^^^^^^^     ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^     ^^^^^^^^^^^^^   ^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >0 : 0
 >  : ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 p.setIndex(1, 0); // ok, 1 is a valid index
 >p.setIndex(1, 0) : void
@@ -736,8 +736,8 @@ p.setIndex(1, 0); // ok, 1 is a valid index
 >         : ^ ^^^^^^^^^^^^^^^^     ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^     ^^^^^^^^^^^^^   ^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >1 : 1
 >  : ^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 p.setIndex(2, 3); // error, 2 is not a valid index
 >p.setIndex(2, 3) : void
@@ -750,8 +750,8 @@ p.setIndex(2, 3); // error, 2 is not a valid index
 >         : ^ ^^^^^^^^^^^^^^^^     ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^     ^^^^^^^^^^^^^   ^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >2 : 2
 >  : ^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // function inference
 declare function f1<T extends string | number>(s: `**${T}**`): T;
diff --git a/tests/baselines/reference/templateLiteralsInTypes.types b/tests/baselines/reference/templateLiteralsInTypes.types
index 3a2cd2f5431..b08fef16f16 100644
--- a/tests/baselines/reference/templateLiteralsInTypes.types
+++ b/tests/baselines/reference/templateLiteralsInTypes.types
@@ -26,8 +26,8 @@ f("x").foo;
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f : (hdr: string, val: number) => `${string}:\t${number}\r\n`
 >  : ^   ^^      ^^   ^^      ^^^^^                           
->"x" : string
->    : ^^^^^^
+>"x" : "x"
+>    : ^^^
 >foo : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/templateStringWithPropertyAccess.types b/tests/baselines/reference/templateStringWithPropertyAccess.types
index 44f54d492f9..99ef2dd0704 100644
--- a/tests/baselines/reference/templateStringWithPropertyAccess.types
+++ b/tests/baselines/reference/templateStringWithPropertyAccess.types
@@ -12,6 +12,6 @@
 >  : ^
 >indexOf : (searchString: string, position?: number) => number
 >        : ^            ^^      ^^        ^^^      ^^^^^      
->`abc` : string
->      : ^^^^^^
+>`abc` : "abc"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/templateStringWithPropertyAccessES6.types b/tests/baselines/reference/templateStringWithPropertyAccessES6.types
index 1c57332bdc9..97c8604da96 100644
--- a/tests/baselines/reference/templateStringWithPropertyAccessES6.types
+++ b/tests/baselines/reference/templateStringWithPropertyAccessES6.types
@@ -12,6 +12,6 @@
 >  : ^
 >indexOf : (searchString: string, position?: number) => number
 >        : ^            ^^      ^^        ^^^      ^^^^^      
->`abc` : string
->      : ^^^^^^
+>`abc` : "abc"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types
index cc476a07815..9fc2dea4c8c 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types
@@ -24,10 +24,10 @@ f({}, 10, 10);
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >{} : {}
 >   : ^^
->10 : number
->   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>10 : 10
+>   : ^^
 
 f `abcdef${ 1234 }${ 5678 }ghijkl`;
 >f `abcdef${ 1234 }${ 5678 }ghijkl` : void
@@ -36,8 +36,8 @@ f `abcdef${ 1234 }${ 5678 }ghijkl`;
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`abcdef${ 1234 }${ 5678 }ghijkl` : string
 >                                 : ^^^^^^
->1234 : number
->     : ^^^^^^
->5678 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
+>5678 : 5678
+>     : ^^^^
 
diff --git a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types
index ed026ddd479..f8a80499655 100644
--- a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types
+++ b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types
@@ -19,10 +19,10 @@ f({}, 10, 10);
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >{} : {}
 >   : ^^
->10 : number
->   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>10 : 10
+>   : ^^
 
 f `abcdef${ 1234 }${ 5678 }ghijkl`;
 >f `abcdef${ 1234 }${ 5678 }ghijkl` : void
@@ -31,8 +31,8 @@ f `abcdef${ 1234 }${ 5678 }ghijkl`;
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`abcdef${ 1234 }${ 5678 }ghijkl` : string
 >                                 : ^^^^^^
->1234 : number
->     : ^^^^^^
->5678 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
+>5678 : 5678
+>     : ^^^^
 
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types
index efa905f949b..ce2d004891f 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types
@@ -24,10 +24,10 @@ f({}, 10, 10);
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >{} : {}
 >   : ^^
->10 : number
->   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>10 : 10
+>   : ^^
 
 f `abcdef${ 1234 }${ 5678 }ghijkl`;
 >f `abcdef${ 1234 }${ 5678 }ghijkl` : void
@@ -36,8 +36,8 @@ f `abcdef${ 1234 }${ 5678 }ghijkl`;
 >  : ^ ^^                    ^^ ^^      ^^ ^^      ^^^^^^^^^
 >`abcdef${ 1234 }${ 5678 }ghijkl` : string
 >                                 : ^^^^^^
->1234 : number
->     : ^^^^^^
->5678 : number
->     : ^^^^^^
+>1234 : 1234
+>     : ^^^^
+>5678 : 5678
+>     : ^^^^
 
diff --git a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types
index ac72d750415..4e4e374aad5 100644
--- a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types
+++ b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.types
@@ -8,10 +8,10 @@
 >                                    : ^ ^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->x = "bad" : string
->          : ^^^^^^
+>x = "bad" : "bad"
+>          : ^^^^^
 >x : number
 >  : ^^^^^^
->"bad" : string
->      : ^^^^^^
+>"bad" : "bad"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types
index 1162fc20d88..14fe4a35cab 100644
--- a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types
+++ b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.types
@@ -8,10 +8,10 @@
 >                                    : ^ ^^      ^^^^^^^^^
 >x : number
 >  : ^^^^^^
->x = "bad" : string
->          : ^^^^^^
+>x = "bad" : "bad"
+>          : ^^^^^
 >x : number
 >  : ^^^^^^
->"bad" : string
->      : ^^^^^^
+>"bad" : "bad"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/thisBinding2.types b/tests/baselines/reference/thisBinding2.types
index ddaf6522e7b..040dd5f9ce0 100644
--- a/tests/baselines/reference/thisBinding2.types
+++ b/tests/baselines/reference/thisBinding2.types
@@ -115,8 +115,8 @@ var messenger = {
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >message : string
 >        : ^^^^^^
->3000 : number
->     : ^^^^^^
+>3000 : 3000
+>     : ^^^^
     }
 };
 
diff --git a/tests/baselines/reference/thisCapture1.types b/tests/baselines/reference/thisCapture1.types
index 0b34481fe3f..aa858d2a6b9 100644
--- a/tests/baselines/reference/thisCapture1.types
+++ b/tests/baselines/reference/thisCapture1.types
@@ -34,16 +34,16 @@ class X {
 >                                        : ^^^^^^^^^^
 
             this.y = 0;
->this.y = 0 : number
->           : ^^^^^^
+>this.y = 0 : 0
+>           : ^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         }).promise();
 >promise : any
diff --git a/tests/baselines/reference/thisInFunctionCall.types b/tests/baselines/reference/thisInFunctionCall.types
index 6ca181e1be0..8a91a9f73e7 100644
--- a/tests/baselines/reference/thisInFunctionCall.types
+++ b/tests/baselines/reference/thisInFunctionCall.types
@@ -21,12 +21,12 @@ class Test {
 >     : ^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
   }
 
   finderRaw() {
diff --git a/tests/baselines/reference/thisInFunctionCallJs.types b/tests/baselines/reference/thisInFunctionCallJs.types
index db175ed32a0..346eae49d38 100644
--- a/tests/baselines/reference/thisInFunctionCallJs.types
+++ b/tests/baselines/reference/thisInFunctionCallJs.types
@@ -18,12 +18,12 @@ class Test {
 >     : ^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
     }
 
     finderRaw() {
diff --git a/tests/baselines/reference/thisInGenericStaticMembers.types b/tests/baselines/reference/thisInGenericStaticMembers.types
index 91eafdfe2e0..9d546432d76 100644
--- a/tests/baselines/reference/thisInGenericStaticMembers.types
+++ b/tests/baselines/reference/thisInGenericStaticMembers.types
@@ -37,8 +37,8 @@ class A {
 >    : ^^^^^^      ^^   ^^     ^^      ^^^^^   
 >source : T
 >       : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -76,8 +76,8 @@ class B {
 >    : ^      ^^ ^^     ^^      ^^^^^ 
 >source : B
 >       : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/thisInSuperCall2.types b/tests/baselines/reference/thisInSuperCall2.types
index 8217b044d34..8b9f7764942 100644
--- a/tests/baselines/reference/thisInSuperCall2.types
+++ b/tests/baselines/reference/thisInSuperCall2.types
@@ -41,8 +41,8 @@ class Foo2 extends Base {
     public x: number = 0;
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     constructor() {
         super(this); // error
diff --git a/tests/baselines/reference/thisInSuperCall3.types b/tests/baselines/reference/thisInSuperCall3.types
index 844366d34b0..20947100248 100644
--- a/tests/baselines/reference/thisInSuperCall3.types
+++ b/tests/baselines/reference/thisInSuperCall3.types
@@ -19,8 +19,8 @@ class Foo extends Base {
     public x: number = 0;
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     constructor() {
         super(this);
diff --git a/tests/baselines/reference/thisPropertyAssignmentInherited.types b/tests/baselines/reference/thisPropertyAssignmentInherited.types
index a5b4a597646..a91a4e05fbd 100644
--- a/tests/baselines/reference/thisPropertyAssignmentInherited.types
+++ b/tests/baselines/reference/thisPropertyAssignmentInherited.types
@@ -13,8 +13,8 @@ export class Element {
 >            : ^^^^^^
 
     return  ''
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
   }
   set textContent(x) {}
 >textContent : string
diff --git a/tests/baselines/reference/thisTag1.types b/tests/baselines/reference/thisTag1.types
index c8e096b7963..07db5c2119e 100644
--- a/tests/baselines/reference/thisTag1.types
+++ b/tests/baselines/reference/thisTag1.types
@@ -53,6 +53,6 @@ o.f('hi')
 >  : ^^^^^^^^^^^^^^^^^      ^^^^^ ^^      ^^^^^      ^^^^^^^^^^^^^^
 >f : (this: { n: number; }, s: string) => number
 >  : ^^^^^^^^^^^^      ^^^^^ ^^      ^^^^^      
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/thisTypeAccessibility.types b/tests/baselines/reference/thisTypeAccessibility.types
index fb5a2fa77ad..38e1aba759e 100644
--- a/tests/baselines/reference/thisTypeAccessibility.types
+++ b/tests/baselines/reference/thisTypeAccessibility.types
@@ -8,38 +8,38 @@ class MyClass {
     private p: number = 123;
 >p : number
 >  : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     protected pp: number = 123;
 >pp : number
 >   : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     public ppp: number = 123;
 >ppp : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     private static sp: number = 123;
 >sp : number
 >   : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     protected static spp: number = 123;
 >spp : number
 >    : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     public static sppp: number = 123;
 >sppp : number
 >     : ^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 }
 
 interface MyClass {
diff --git a/tests/baselines/reference/thisTypeErrors2.types b/tests/baselines/reference/thisTypeErrors2.types
index 23b70398acc..abedc04eb88 100644
--- a/tests/baselines/reference/thisTypeErrors2.types
+++ b/tests/baselines/reference/thisTypeErrors2.types
@@ -33,16 +33,16 @@ class Derived {
 >     : ^^^^
 
         this.n = 12;
->this.n = 12 : number
->            : ^^^^^^
+>this.n = 12 : 12
+>            : ^^
 >this.n : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >n : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/thisTypeInAccessorsNegative.types b/tests/baselines/reference/thisTypeInAccessorsNegative.types
index d554cc1843e..43bb1b789ed 100644
--- a/tests/baselines/reference/thisTypeInAccessorsNegative.types
+++ b/tests/baselines/reference/thisTypeInAccessorsNegative.types
@@ -66,8 +66,8 @@ const contextual: Foo = {
     n: 16,
 >n : number
 >  : ^^^^^^
->16 : number
->   : ^^^^^^
+>16 : 16
+>   : ^^
 
     get x() { return this.n; }
 >x : number
diff --git a/tests/baselines/reference/thisTypeInFunctions.types b/tests/baselines/reference/thisTypeInFunctions.types
index 411ea6cda25..1f704de6562 100644
--- a/tests/baselines/reference/thisTypeInFunctions.types
+++ b/tests/baselines/reference/thisTypeInFunctions.types
@@ -209,8 +209,8 @@ let impl: I = {
     a: 12,
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)
 >explicitVoid2 : () => any
@@ -227,8 +227,8 @@ let impl: I = {
     explicitVoid1() { return 12; },
 >explicitVoid1 : (this: void) => number
 >              : ^    ^^    ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitStructural() {
 >explicitStructural : (this: { a: number; }) => number
@@ -281,8 +281,8 @@ impl.explicitVoid1 = function () { return 12; };
 >              : ^    ^^    ^^^^^      
 >function () { return 12; } : (this: void) => number
 >                           : ^    ^^    ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 impl.explicitVoid2 = () => 12;
 >impl.explicitVoid2 = () => 12 : () => number
@@ -295,8 +295,8 @@ impl.explicitVoid2 = () => 12;
 >              : ^    ^^    ^^^^^      
 >() => 12 : () => number
 >         : ^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 impl.explicitStructural = function() { return this.a; };
 >impl.explicitStructural = function() { return this.a; } : (this: { a: number; }) => number
@@ -345,8 +345,8 @@ impl.explicitStructural = () => 12;
 >                   : ^    ^^              ^^^^^      
 >() => 12 : () => number
 >         : ^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 impl.explicitInterface = () => 12;
 >impl.explicitInterface = () => 12 : () => number
@@ -359,8 +359,8 @@ impl.explicitInterface = () => 12;
 >                  : ^    ^^ ^^^^^      
 >() => 12 : () => number
 >         : ^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 impl.explicitThis = function () { return this.a; };
 >impl.explicitThis = function () { return this.a; } : (this: I) => number
@@ -398,8 +398,8 @@ let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, f:
 >                                 : ^^^^^^^^^^^^^^^^^    ^^              ^^ ^^      ^^^^^      ^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >f : (this: { y: number; }, x: number) => number
 >  : ^    ^^              ^^ ^^      ^^^^^      
 >explicitStructural : (this: { y: number; }, x: number) => number
@@ -418,8 +418,8 @@ let implicitAnyOk: {notSpecified: number, f: (x: number) => number} = { notSpeci
 >                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^
 >notSpecified : number
 >             : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >f : (n: number) => number
 >  : ^ ^^      ^^^^^      
 >implicitThis : (n: number) => number
@@ -434,16 +434,16 @@ ok.f(13);
 >   : ^^^^^      ^^^^^                                           ^^^
 >f : (this: { y: number; }, x: number) => number
 >  : ^    ^^              ^^ ^^      ^^^^^      
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 
 implicitThis(12);
 >implicitThis(12) : number
 >                 : ^^^^^^
 >implicitThis : (n: number) => number
 >             : ^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 implicitAnyOk.f(12);
 >implicitAnyOk.f(12) : number
@@ -454,8 +454,8 @@ implicitAnyOk.f(12);
 >              : ^^^^^^^^^^^^^^^^      ^^^^^                     ^^^
 >f : (x: number) => number
 >  : ^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 let c = new C();
 >c : C
@@ -492,8 +492,8 @@ c.explicitC(12);
 >  : ^
 >explicitC : (this: C, m: number) => number
 >          : ^    ^^ ^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 c.explicitProperty(12);
 >c.explicitProperty(12) : number
@@ -504,8 +504,8 @@ c.explicitProperty(12);
 >  : ^
 >explicitProperty : (this: { n: number; }, m: number) => number
 >                 : ^    ^^              ^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 c.explicitThis(12);
 >c.explicitThis(12) : number
@@ -516,8 +516,8 @@ c.explicitThis(12);
 >  : ^
 >explicitThis : (this: C, m: number) => number
 >             : ^    ^^^^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 d.explicitC(12);
 >d.explicitC(12) : number
@@ -528,8 +528,8 @@ d.explicitC(12);
 >  : ^
 >explicitC : (this: C, m: number) => number
 >          : ^    ^^ ^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 d.explicitProperty(12);
 >d.explicitProperty(12) : number
@@ -540,8 +540,8 @@ d.explicitProperty(12);
 >  : ^
 >explicitProperty : (this: { n: number; }, m: number) => number
 >                 : ^    ^^              ^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 d.explicitThis(12);
 >d.explicitThis(12) : number
@@ -552,8 +552,8 @@ d.explicitThis(12);
 >  : ^
 >explicitThis : (this: D, m: number) => number
 >             : ^    ^^^^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 let reconstructed: { 
 >reconstructed : { n: number; explicitThis(this: C, m: number): number; explicitC(this: C, m: number): number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid(this: void, m: number): number; }
@@ -604,8 +604,8 @@ let reconstructed: {
     n: 12,
 >n : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitThis: c.explicitThis,
 >explicitThis : (this: C, m: number) => number
@@ -657,8 +657,8 @@ reconstructed.explicitThis(10);
 >              : ^^^^^      ^^^^^^^^^^^^^^^    ^^ ^^ ^^      ^^^      ^^^^^^^^^^^^    ^^ ^^ ^^      ^^^      ^^^^^^^^^^^^^^^^^^^^                                           ^^^^^^^^^^^^^^^    ^^    ^^ ^^      ^^^      ^^^
 >explicitThis : (this: C, m: number) => number
 >             : ^    ^^ ^^ ^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 reconstructed.explicitProperty(11);
 >reconstructed.explicitProperty(11) : number
@@ -669,8 +669,8 @@ reconstructed.explicitProperty(11);
 >              : ^^^^^      ^^^^^^^^^^^^^^^    ^^ ^^ ^^      ^^^      ^^^^^^^^^^^^    ^^ ^^ ^^      ^^^      ^^^^^^^^^^^^^^^^^^^^                                           ^^^^^^^^^^^^^^^    ^^    ^^ ^^      ^^^      ^^^
 >explicitProperty : (this: { n: number; }, m: number) => number
 >                 : ^    ^^              ^^ ^^      ^^^^^      
->11 : number
->   : ^^^^^^
+>11 : 11
+>   : ^^
 
 let explicitVoid = reconstructed.explicitVoid;
 >explicitVoid : (this: void, m: number) => number
@@ -687,8 +687,8 @@ explicitVoid(12);
 >                 : ^^^^^^
 >explicitVoid : (this: void, m: number) => number
 >             : ^    ^^    ^^ ^^      ^^^^^      
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 // assignment checking
 let unboundToSpecified: (this: { y: number }, x: number) => number = x => x + this.y; // ok, this:any
@@ -1464,16 +1464,16 @@ function InterfaceThis(this: I) {
 >     : ^
 
     this.a = 12;
->this.a = 12 : number
->            : ^^^^^^
+>this.a = 12 : 12
+>            : ^^
 >this.a : number
 >       : ^^^^^^
 >this : I
 >     : ^
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 }
 function LiteralTypeThis(this: {x: string}) {
 >LiteralTypeThis : (this: { x: string; }) => void
@@ -1484,16 +1484,16 @@ function LiteralTypeThis(this: {x: string}) {
 >  : ^^^^^^
 
     this.x = "ok";
->this.x = "ok" : string
->              : ^^^^^^
+>this.x = "ok" : "ok"
+>              : ^^^^
 >this.x : string
 >       : ^^^^^^
 >this : { x: string; }
 >     : ^^^^^      ^^^
 >x : string
 >  : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 }
 function AnyThis(this: any) {
 >AnyThis : (this: any) => void
diff --git a/tests/baselines/reference/thisTypeInFunctions2.types b/tests/baselines/reference/thisTypeInFunctions2.types
index c9f837c12cf..d17fc5d7ad2 100644
--- a/tests/baselines/reference/thisTypeInFunctions2.types
+++ b/tests/baselines/reference/thisTypeInFunctions2.types
@@ -206,8 +206,8 @@ simple({
 >    : ^^^^^^^^^^^^
 
         return 14;
->14 : number
->   : ^^^^^^
+>14 : 14
+>   : ^^
     }
 })
 
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.types b/tests/baselines/reference/thisTypeInFunctionsNegative.types
index f10195433f2..83e099ead16 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.types
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.types
@@ -205,8 +205,8 @@ let impl: I = {
     a: 12,
 >a : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitVoid1() {
 >explicitVoid1 : (this: void) => any
@@ -238,16 +238,16 @@ let impl: I = {
 >                   : ^^^^^^^^^^^^
 >() => 12 : () => number
 >         : ^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitInterface: () => 12,
 >explicitInterface : () => number
 >                  : ^^^^^^^^^^^^
 >() => 12 : () => number
 >         : ^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitThis() {
 >explicitThis : (this: I) => number
@@ -376,8 +376,8 @@ let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, ex
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^              ^^ ^^      ^^^^^      ^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >explicitStructural : (this: { y: number; }, x: number) => number
 >                   : ^    ^^              ^^ ^^      ^^^^^      
 
@@ -398,8 +398,8 @@ let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^              ^^ ^^      ^^^^^      ^^^
 >y : string
 >  : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 >explicitStructural : (this: { y: number; }, x: number) => number
 >                   : ^    ^^              ^^ ^^      ^^^^^      
 
@@ -420,8 +420,8 @@ let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) =
 >                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^              ^^ ^^      ^^^^^      ^^^
 >wrongName : number
 >          : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >explicitStructural : (this: { y: number; }, x: number) => number
 >                   : ^    ^^              ^^ ^^      ^^^^^      
 
@@ -444,8 +444,8 @@ ok.f('wrong type');
 >   : ^^^^^      ^^^^^                                           ^^^
 >f : (this: { y: number; }, x: number) => number
 >  : ^    ^^              ^^ ^^      ^^^^^      
->'wrong type' : string
->             : ^^^^^^
+>'wrong type' : "wrong type"
+>             : ^^^^^^^^^^^^
 
 ok.f(13, 'too many arguments');
 >ok.f(13, 'too many arguments') : number
@@ -456,8 +456,8 @@ ok.f(13, 'too many arguments');
 >   : ^^^^^      ^^^^^                                           ^^^
 >f : (this: { y: number; }, x: number) => number
 >  : ^    ^^              ^^ ^^      ^^^^^      
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 >'too many arguments' : "too many arguments"
 >                     : ^^^^^^^^^^^^^^^^^^^^
 
@@ -470,8 +470,8 @@ wrongPropertyType.f(13);
 >                  : ^^^^^      ^^^^^                                           ^^^
 >f : (this: { y: number; }, x: number) => number
 >  : ^    ^^              ^^ ^^      ^^^^^      
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 
 wrongPropertyName.f(13);
 >wrongPropertyName.f(13) : number
@@ -482,8 +482,8 @@ wrongPropertyName.f(13);
 >                  : ^^^^^^^^^^^^^      ^^^^^                                           ^^^
 >f : (this: { y: number; }, x: number) => number
 >  : ^    ^^              ^^ ^^      ^^^^^      
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 
 let c = new C();
 >c : C
@@ -512,8 +512,8 @@ c.explicitC('wrong type');
 >  : ^
 >explicitC : (this: C, m: number) => number
 >          : ^    ^^ ^^ ^^      ^^^^^      
->'wrong type' : string
->             : ^^^^^^
+>'wrong type' : "wrong type"
+>             : ^^^^^^^^^^^^
 
 c.explicitC(13, 'too many arguments');
 >c.explicitC(13, 'too many arguments') : number
@@ -524,8 +524,8 @@ c.explicitC(13, 'too many arguments');
 >  : ^
 >explicitC : (this: C, m: number) => number
 >          : ^    ^^ ^^ ^^      ^^^^^      
->13 : number
->   : ^^^^^^
+>13 : 13
+>   : ^^
 >'too many arguments' : "too many arguments"
 >                     : ^^^^^^^^^^^^^^^^^^^^
 
@@ -548,8 +548,8 @@ c.explicitThis('wrong type 2');
 >  : ^
 >explicitThis : (this: C, m: number) => number
 >             : ^    ^^^^^ ^^      ^^^^^      
->'wrong type 2' : string
->               : ^^^^^^
+>'wrong type 2' : "wrong type 2"
+>               : ^^^^^^^^^^^^^^
 
 c.explicitThis(14, 'too many arguments 2');
 >c.explicitThis(14, 'too many arguments 2') : number
@@ -560,8 +560,8 @@ c.explicitThis(14, 'too many arguments 2');
 >  : ^
 >explicitThis : (this: C, m: number) => number
 >             : ^    ^^^^^ ^^      ^^^^^      
->14 : number
->   : ^^^^^^
+>14 : 14
+>   : ^^
 >'too many arguments 2' : "too many arguments 2"
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -584,8 +584,8 @@ c.implicitThis('wrong type 2');
 >  : ^
 >implicitThis : (m: number) => number
 >             : ^ ^^      ^^^^^      
->'wrong type 2' : string
->               : ^^^^^^
+>'wrong type 2' : "wrong type 2"
+>               : ^^^^^^^^^^^^^^
 
 c.implicitThis(14, 'too many arguments 2');
 >c.implicitThis(14, 'too many arguments 2') : number
@@ -596,8 +596,8 @@ c.implicitThis(14, 'too many arguments 2');
 >  : ^
 >implicitThis : (m: number) => number
 >             : ^ ^^      ^^^^^      
->14 : number
->   : ^^^^^^
+>14 : 14
+>   : ^^
 >'too many arguments 2' : "too many arguments 2"
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -620,8 +620,8 @@ c.explicitProperty('wrong type 3');
 >  : ^
 >explicitProperty : (this: { n: number; }, m: number) => number
 >                 : ^    ^^              ^^ ^^      ^^^^^      
->'wrong type 3' : string
->               : ^^^^^^
+>'wrong type 3' : "wrong type 3"
+>               : ^^^^^^^^^^^^^^
 
 c.explicitProperty(15, 'too many arguments 3');
 >c.explicitProperty(15, 'too many arguments 3') : number
@@ -632,8 +632,8 @@ c.explicitProperty(15, 'too many arguments 3');
 >  : ^
 >explicitProperty : (this: { n: number; }, m: number) => number
 >                 : ^    ^^              ^^ ^^      ^^^^^      
->15 : number
->   : ^^^^^^
+>15 : 15
+>   : ^^
 >'too many arguments 3' : "too many arguments 3"
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -697,8 +697,8 @@ let reconstructed: {
     n: 12,
 >n : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
     explicitThis: c.explicitThis,
 >explicitThis : (this: C, m: number) => number
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals2.types b/tests/baselines/reference/thisTypeInObjectLiterals2.types
index faa22d58e68..05cb646d4ee 100644
--- a/tests/baselines/reference/thisTypeInObjectLiterals2.types
+++ b/tests/baselines/reference/thisTypeInObjectLiterals2.types
@@ -141,14 +141,14 @@ let p1: Point = {
     x: 10,
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     y: 20,
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     moveBy(dx, dy, dz) {
 >moveBy : (dx: number, dy: number, dz: number | undefined) => void
@@ -220,14 +220,14 @@ let p2: Point | null = {
     x: 10,
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     y: 20,
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     moveBy(dx, dy, dz) {
 >moveBy : (dx: number, dy: number, dz: number | undefined) => void
@@ -299,14 +299,14 @@ let p3: Point | undefined = {
     x: 10,
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     y: 20,
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     moveBy(dx, dy, dz) {
 >moveBy : (dx: number, dy: number, dz: number | undefined) => void
@@ -378,14 +378,14 @@ let p4: Point | null | undefined = {
     x: 10,
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     y: 20,
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     moveBy(dx, dy, dz) {
 >moveBy : (dx: number, dy: number, dz: number | undefined) => void
@@ -465,14 +465,14 @@ f1({
     x: 10,
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     y: 20,
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     moveBy(dx, dy, dz) {
 >moveBy : (dx: number, dy: number, dz: number | undefined) => void
@@ -552,14 +552,14 @@ f2({
     x: 10,
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     y: 20,
 >y : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
     moveBy(dx, dy, dz) {
 >moveBy : (dx: number, dy: number, dz: number | undefined) => void
@@ -661,12 +661,12 @@ let x1 = makeObject({
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     methods: {
 >methods : { moveBy(dx: number, dy: number): void; }
@@ -748,12 +748,12 @@ let x2 = makeObject2({
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     methods: {
 >methods : { moveBy(dx: number, dy: number): void; }
@@ -857,8 +857,8 @@ let p10 = defineProp(p1, "foo", { value: 42 });
 >              : ^^^^^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 p10.foo = p10.foo + 1;
 >p10.foo = p10.foo + 1 : number
@@ -967,8 +967,8 @@ let p12 = defineProps(p1, {
         value: 42
 >value : number
 >      : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     },
     bar: {
@@ -1121,12 +1121,12 @@ let vue = new Vue({
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     methods: {
 >methods : { f(x: string): number; }
@@ -1179,8 +1179,8 @@ let vue = new Vue({
 >    : ^^^^^^^^^^^^
 
                 return "hi";
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
             },
             set(value: string) {
@@ -1214,8 +1214,8 @@ vue.f("abc");
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >f : (x: string) => number
 >  : ^ ^^      ^^^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 vue.test;
 >vue.test : number
diff --git a/tests/baselines/reference/thisTypeInTuples.types b/tests/baselines/reference/thisTypeInTuples.types
index c2444480c42..4df23939db1 100644
--- a/tests/baselines/reference/thisTypeInTuples.types
+++ b/tests/baselines/reference/thisTypeInTuples.types
@@ -12,10 +12,10 @@ let t: [number, string] = [42, "hello"];
 >  : ^^^^^^^^^^^^^^^^
 >[42, "hello"] : [number, string]
 >              : ^^^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>42 : 42
+>   : ^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 let a = t.slice();
 >a : [number, string]
@@ -40,8 +40,8 @@ let b = t.slice(1);
 >  : ^^^^^^^^^^^^^^^^
 >slice : { (start?: number, end?: number): (string | number)[]; (): [number, string]; }
 >      : ^^^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 let c = t.slice(0, 1);
 >c : (string | number)[]
@@ -54,8 +54,8 @@ let c = t.slice(0, 1);
 >  : ^^^^^^^^^^^^^^^^
 >slice : { (start?: number, end?: number): (string | number)[]; (): [number, string]; }
 >      : ^^^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/thisTypeOfConstructorFunctions.types b/tests/baselines/reference/thisTypeOfConstructorFunctions.types
index 54ac01ad846..5023191f43f 100644
--- a/tests/baselines/reference/thisTypeOfConstructorFunctions.types
+++ b/tests/baselines/reference/thisTypeOfConstructorFunctions.types
@@ -152,8 +152,8 @@ var cp = new Cp(1)
 >          : ^^^^^^^^^^
 >Cp : typeof Cp
 >   : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var cpp = new Cpp(2)
 >cpp : Cpp<number>
@@ -162,8 +162,8 @@ var cpp = new Cpp(2)
 >           : ^^^^^^^^^^^
 >Cpp : typeof Cpp
 >    : ^^^^^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 cp.dit
 >cp.dit : Cp<number>
diff --git a/tests/baselines/reference/thisTypeSyntacticContext.types b/tests/baselines/reference/thisTypeSyntacticContext.types
index 38bead6d9e6..0d18cf2933e 100644
--- a/tests/baselines/reference/thisTypeSyntacticContext.types
+++ b/tests/baselines/reference/thisTypeSyntacticContext.types
@@ -25,8 +25,8 @@ const o: { n: number, test?: (this: { n: number }) => void } = { n: 1 }
 >         : ^^^^^^^^^^^^^^
 >n : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 o.test = f
 >o.test = f : (this: { n: number; }) => void
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 2985d315283..697b9d5d871 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -40,8 +40,8 @@ function F(x: string): number { return 42; }
 >  : ^ ^^      ^^^^^      
 >x : string
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 module M {
 >M : typeof M
@@ -98,8 +98,8 @@ var aDate = new Date(12);
 >             : ^^^^
 >Date : DateConstructor
 >     : ^^^^^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 throw aDate;
 >aDate : Date
@@ -195,8 +195,8 @@ throw aFunction('');
 >              : ^^^^^^
 >aFunction : (x: string) => number
 >          : ^ ^^      ^^^^^      
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var aLambda = (x) => 2;
 >aLambda : (x: any) => number
diff --git a/tests/baselines/reference/topLevel.types b/tests/baselines/reference/topLevel.types
index 78ecd79d8c5..779e5f6174e 100644
--- a/tests/baselines/reference/topLevel.types
+++ b/tests/baselines/reference/topLevel.types
@@ -112,10 +112,10 @@ result+=(new Point(3,4).move(2,2));
 >  : ^
 >move : (xo: number, yo: number) => Point
 >     : ^  ^^      ^^  ^^      ^^^^^^^^^^
->2 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>2 : 2
+>  : ^
 
 module M {
 >M : typeof M
@@ -153,9 +153,9 @@ result+=(M.origin.move(1,1));
 >       : ^^^^^
 >move : (xo: number, yo: number) => Point
 >     : ^  ^^      ^^  ^^      ^^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
 
diff --git a/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2015).types b/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2015).types
index a4887a3920e..ac622b31610 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2015).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2015).types
@@ -97,8 +97,8 @@ await <string> ``;
 >                  : ^^^^^^
 ><string> `` : string
 >            : ^^^^^^
->`` : string
->   : ^^^^^^
+>`` : ""
+>   : ^^
 
 // member names should be ok
 class C1 {
diff --git a/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2017).types b/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2017).types
index e8fd3e0a3bc..f2a9992f6d3 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2017).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=es2022,target=es2017).types
@@ -97,8 +97,8 @@ await <string> ``;
 >                  : ^^^^^^
 ><string> `` : string
 >            : ^^^^^^
->`` : string
->   : ^^^^^^
+>`` : ""
+>   : ^^
 
 // member names should be ok
 class C1 {
diff --git a/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2015).types b/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2015).types
index a4887a3920e..ac622b31610 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2015).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2015).types
@@ -97,8 +97,8 @@ await <string> ``;
 >                  : ^^^^^^
 ><string> `` : string
 >            : ^^^^^^
->`` : string
->   : ^^^^^^
+>`` : ""
+>   : ^^
 
 // member names should be ok
 class C1 {
diff --git a/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2017).types b/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2017).types
index e8fd3e0a3bc..f2a9992f6d3 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2017).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=esnext,target=es2017).types
@@ -97,8 +97,8 @@ await <string> ``;
 >                  : ^^^^^^
 ><string> `` : string
 >            : ^^^^^^
->`` : string
->   : ^^^^^^
+>`` : ""
+>   : ^^
 
 // member names should be ok
 class C1 {
diff --git a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).types b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).types
index a4887a3920e..ac622b31610 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).types
@@ -97,8 +97,8 @@ await <string> ``;
 >                  : ^^^^^^
 ><string> `` : string
 >            : ^^^^^^
->`` : string
->   : ^^^^^^
+>`` : ""
+>   : ^^
 
 // member names should be ok
 class C1 {
diff --git a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
index e8fd3e0a3bc..f2a9992f6d3 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
@@ -97,8 +97,8 @@ await <string> ``;
 >                  : ^^^^^^
 ><string> `` : string
 >            : ^^^^^^
->`` : string
->   : ^^^^^^
+>`` : ""
+>   : ^^
 
 // member names should be ok
 class C1 {
diff --git a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.types b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.types
index 40e1dfd8184..b405d64ec6c 100644
--- a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.types
+++ b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.types
@@ -27,14 +27,14 @@ class arrTest {
 >     : ^    ^^        ^^^^^^^^^
 >[1, 2, "hi", 5, ] : (string | number)[]
 >                  : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"hi" : string
->     : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"hi" : "hi"
+>     : ^^^^
+>5 : 5
+>  : ^
 
         this.test([1, 2, "hi", 5]); 
 >this.test([1, 2, "hi", 5]) : void
@@ -47,14 +47,14 @@ class arrTest {
 >     : ^    ^^        ^^^^^^^^^
 >[1, 2, "hi", 5] : (string | number)[]
 >                : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->"hi" : string
->     : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>"hi" : "hi"
+>     : ^^^^
+>5 : 5
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).types b/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).types
index fb28d430116..fb8b260b07e 100644
--- a/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).types
+++ b/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).types
@@ -15,6 +15,6 @@ const a: GlobalThing = { a: 0 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node16).types b/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node16).types
index fb28d430116..fb8b260b07e 100644
--- a/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node16).types
+++ b/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node16).types
@@ -15,6 +15,6 @@ const a: GlobalThing = { a: 0 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).types b/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).types
index fb28d430116..fb8b260b07e 100644
--- a/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).types
+++ b/tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).types
@@ -15,6 +15,6 @@ const a: GlobalThing = { a: 0 };
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/tryCatchFinallyControlFlow.types b/tests/baselines/reference/tryCatchFinallyControlFlow.types
index 09cd4d8770f..a6d1212418f 100644
--- a/tests/baselines/reference/tryCatchFinallyControlFlow.types
+++ b/tests/baselines/reference/tryCatchFinallyControlFlow.types
@@ -13,12 +13,12 @@ function f1() {
 
     try {
         a = 123;
->a = 123 : number
->        : ^^^^^^
+>a = 123 : 123
+>        : ^^^
 >a : number | null
 >  : ^^^^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
         return a;
 >a : number
@@ -50,8 +50,8 @@ function f1() {
 >  : ^^^^^^
 >toFixed : (fractionDigits?: number) => string
 >        : ^              ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >"123" : "123"
 >      : ^^^^^
         }
@@ -763,12 +763,12 @@ const main = () => {
 
     try {
         hoge = 'hoge!';
->hoge = 'hoge!' : string
->               : ^^^^^^
+>hoge = 'hoge!' : "hoge!"
+>               : ^^^^^^^
 >hoge : string | undefined
 >     : ^^^^^^^^^^^^^^^^^^
->'hoge!' : string
->        : ^^^^^^
+>'hoge!' : "hoge!"
+>        : ^^^^^^^
 
         return;
     }
diff --git a/tests/baselines/reference/ts-expect-error.types b/tests/baselines/reference/ts-expect-error.types
index a5b38a7c374..de4290841db 100644
--- a/tests/baselines/reference/ts-expect-error.types
+++ b/tests/baselines/reference/ts-expect-error.types
@@ -5,7 +5,7 @@
 var invalidCommentedFancySingle: number = 'nope';
 >invalidCommentedFancySingle : number
 >                            : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 /*
@@ -13,28 +13,28 @@ var invalidCommentedFancySingle: number = 'nope';
 var invalidCommentedFancyMulti: number = 'nope';
 >invalidCommentedFancyMulti : number
 >                           : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-expect-error additional commenting
 var validCommentedFancySingle: string = 'nope';
 >validCommentedFancySingle : string
 >                          : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 /* @ts-expect-error additional commenting */
 var validCommentedFancyMulti: string = 'nope';
 >validCommentedFancyMulti : string
 >                         : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-expect-error
 var invalidCommentedPlainSingle: number = 'nope';
 >invalidCommentedPlainSingle : number
 >                            : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 /*
@@ -42,21 +42,21 @@ var invalidCommentedPlainSingle: number = 'nope';
 var invalidCommentedPlainMulti: number = 'nope';
 >invalidCommentedPlainMulti : number
 >                           : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-expect-error
 var validCommentedPlainSingle: string = 'nope';
 >validCommentedPlainSingle : string
 >                          : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 /* @ts-expect-error */
 var validCommentedPlainMulti1: string = 'nope';
 >validCommentedPlainMulti1 : string
 >                          : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 /*
@@ -64,19 +64,19 @@ var validCommentedPlainMulti1: string = 'nope';
 var validCommentedPlainMulti2: string = 'nope';
 >validCommentedPlainMulti2 : string
 >                          : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 var invalidPlain: number = 'nope';
 >invalidPlain : number
 >             : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 var validPlain: string = 'nope';
 >validPlain : string
 >           : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-expect-error
@@ -172,7 +172,7 @@ var validPlain: string = 'nope';
 var invalidCommentedFancySingle: number = 'nope';
 >invalidCommentedFancySingle : number
 >                            : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 /*
@@ -180,6 +180,6 @@ var invalidCommentedFancySingle: number = 'nope';
 var invalidCommentedFancyMulti: number = 'nope';
 >invalidCommentedFancyMulti : number
 >                           : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/ts-ignore.types b/tests/baselines/reference/ts-ignore.types
index 83050af8474..186f5eb9f6b 100644
--- a/tests/baselines/reference/ts-ignore.types
+++ b/tests/baselines/reference/ts-ignore.types
@@ -5,53 +5,53 @@
 var invalidCommentedFancy: number = 'nope';
 >invalidCommentedFancy : number
 >                      : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-ignore with additional commenting
 var validCommentedFancy: string = 'nope';
 >validCommentedFancy : string
 >                    : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-ignore
 var invalidCommentedPlain: number = 'nope';
 >invalidCommentedPlain : number
 >                      : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-ignore
 var validCommentedPlain: string = 'nope';
 >validCommentedPlain : string
 >                    : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 var invalidPlain: number = 'nope';
 >invalidPlain : number
 >             : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 var validPlain: string = 'nope';
 >validPlain : string
 >           : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-ignore: with additional commenting
 var invalidCommentedFancy: number = 'nope';
 >invalidCommentedFancy : number
 >                      : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
 // @ts-ignore: with additional commenting
 var validCommentedFancy: string = 'nope';
 >validCommentedFancy : string
 >                    : ^^^^^^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/tsNoCheckForTypescript.types b/tests/baselines/reference/tsNoCheckForTypescript.types
index 0073c5b31ce..2db7f033b92 100644
--- a/tests/baselines/reference/tsNoCheckForTypescript.types
+++ b/tests/baselines/reference/tsNoCheckForTypescript.types
@@ -24,7 +24,7 @@ export class Bet implements Aleph {
     q: string = "lol" // And so will this implements error
 >q : string
 >  : ^^^^^^
->"lol" : string
->      : ^^^^^^
+>"lol" : "lol"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/tsNoCheckForTypescriptComments1.types b/tests/baselines/reference/tsNoCheckForTypescriptComments1.types
index 1836e88a564..7c73e733dd4 100644
--- a/tests/baselines/reference/tsNoCheckForTypescriptComments1.types
+++ b/tests/baselines/reference/tsNoCheckForTypescriptComments1.types
@@ -24,7 +24,7 @@ export class Bet implements Aleph {
   q: string = 'lol'; // And so will this implements error
 >q : string
 >  : ^^^^^^
->'lol' : string
->      : ^^^^^^
+>'lol' : "lol"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/tsNoCheckForTypescriptComments2.types b/tests/baselines/reference/tsNoCheckForTypescriptComments2.types
index 22c9cf97111..564020d6eab 100644
--- a/tests/baselines/reference/tsNoCheckForTypescriptComments2.types
+++ b/tests/baselines/reference/tsNoCheckForTypescriptComments2.types
@@ -24,7 +24,7 @@ export class Bet implements Aleph {
     q: string = "lol" // And so will this implements error
 >q : string
 >  : ^^^^^^
->"lol" : string
->      : ^^^^^^
+>"lol" : "lol"
+>      : ^^^^^
 }
 
diff --git a/tests/baselines/reference/tsxAttributeErrors.types b/tests/baselines/reference/tsxAttributeErrors.types
index 0d7408d0f52..27299c1c77e 100644
--- a/tests/baselines/reference/tsxAttributeErrors.types
+++ b/tests/baselines/reference/tsxAttributeErrors.types
@@ -31,8 +31,8 @@ declare namespace JSX {
 >    : ^^^
 >text : number
 >     : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 // Error, string is not assignable to number
 <div width={'foo'} />;
@@ -42,8 +42,8 @@ declare namespace JSX {
 >    : ^^^
 >width : string
 >      : ^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 // Error, number is not assignable to string
 var attribs = { text: 100 };
diff --git a/tests/baselines/reference/tsxAttributeResolution1.types b/tests/baselines/reference/tsxAttributeResolution1.types
index 7dfac32355e..bafd96a92d4 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.types
+++ b/tests/baselines/reference/tsxAttributeResolution1.types
@@ -39,8 +39,8 @@ interface Attribs1 {
 >      : ^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 <test1 />; // OK
 ><test1 /> : JSX.Element
@@ -73,7 +73,7 @@ interface Attribs1 {
 >      : ^^^
 >reqd : string
 >     : ^^^^^^
->'true' : string
+>'true' : "true"
 >       : ^^^^^^
 
 // Errors
@@ -84,8 +84,8 @@ interface Attribs1 {
 >      : ^^^
 >x : string
 >  : ^^^^^^
->'0' : string
->    : ^^^^^^
+>'0' : "0"
+>    : ^^^
 
 <test1 y={0} />; // Error, no property "y"
 ><test1 y={0} /> : JSX.Element
@@ -134,8 +134,8 @@ interface Attribs1 {
 >      : ^^^
 >reqd : number
 >     : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 // Should be OK
 <var var='var' />;
diff --git a/tests/baselines/reference/tsxAttributeResolution14.types b/tests/baselines/reference/tsxAttributeResolution14.types
index 88db4114935..41e242fd8bf 100644
--- a/tests/baselines/reference/tsxAttributeResolution14.types
+++ b/tests/baselines/reference/tsxAttributeResolution14.types
@@ -60,8 +60,8 @@ function VerticalNav() {
 >                    : ^    ^^      ^^^^^^^^^^^^^^^^
 >primaryText : number
 >            : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
       <VerticalNavMenuItem justRandomProp={2} primaryText={"hello"} />  // ok
 ><VerticalNavMenuItem justRandomProp={2} primaryText={"hello"} /> : JSX.Element
@@ -70,12 +70,12 @@ function VerticalNav() {
 >                    : ^    ^^      ^^^^^^^^^^^^^^^^
 >justRandomProp : number
 >               : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >primaryText : string
 >            : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
       <VerticalNavMenuItem justRandomProp1={true} primaryText={"hello"} />  // error
 ><VerticalNavMenuItem justRandomProp1={true} primaryText={"hello"} /> : JSX.Element
@@ -88,8 +88,8 @@ function VerticalNav() {
 >     : ^^^^
 >primaryText : string
 >            : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     </div>
 >div : any
diff --git a/tests/baselines/reference/tsxAttributeResolution3.types b/tests/baselines/reference/tsxAttributeResolution3.types
index 7e465b717c3..82a09985d48 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.types
+++ b/tests/baselines/reference/tsxAttributeResolution3.types
@@ -175,8 +175,8 @@ var obj7 = { x: 'foo' };
 >      : ^^^
 >x : number
 >  : ^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 >obj7 : { x: string; }
 >     : ^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxAttributeResolution7.types b/tests/baselines/reference/tsxAttributeResolution7.types
index 19bf6e09d38..84c035c6cde 100644
--- a/tests/baselines/reference/tsxAttributeResolution7.types
+++ b/tests/baselines/reference/tsxAttributeResolution7.types
@@ -20,8 +20,8 @@ declare module JSX {
 >      : ^^^
 >data-foo : number
 >         : ^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
 // OK
 <test1 data-foo={'32'} />;
@@ -31,8 +31,8 @@ declare module JSX {
 >      : ^^^
 >data-foo : string
 >         : ^^^^^^
->'32' : string
->     : ^^^^^^
+>'32' : "32"
+>     : ^^^^
 
 <test1 data-bar={'32'} />;
 ><test1 data-bar={'32'} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxAttributeResolution9.types b/tests/baselines/reference/tsxAttributeResolution9.types
index 73e8a4dd982..77d57bc564c 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.types
+++ b/tests/baselines/reference/tsxAttributeResolution9.types
@@ -50,6 +50,6 @@ export class MyComponent {
 >            : ^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
index 095fbde90f1..8c9d75160e1 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
@@ -62,8 +62,8 @@ export const result = <MyComponent x="yes" y={{
     value: 42
 >value : number
 >      : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 }} />;
 
diff --git a/tests/baselines/reference/tsxDynamicTagName5.types b/tests/baselines/reference/tsxDynamicTagName5.types
index 6668cf177bd..94c161b7555 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.types
+++ b/tests/baselines/reference/tsxDynamicTagName5.types
@@ -28,8 +28,8 @@ export class Text extends React.Component<{}, {}> {
   _tagName: string = 'div';
 >_tagName : string
 >         : ^^^^^^
->'div' : string
->      : ^^^^^^
+>'div' : "div"
+>      : ^^^^^
 
   render() {
 >render : () => any
diff --git a/tests/baselines/reference/tsxDynamicTagName7.types b/tests/baselines/reference/tsxDynamicTagName7.types
index 5d627d54ceb..a607abba4bb 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.types
+++ b/tests/baselines/reference/tsxDynamicTagName7.types
@@ -28,8 +28,8 @@ export class Text extends React.Component<{}, {}> {
   _tagName: string = 'div';
 >_tagName : string
 >         : ^^^^^^
->'div' : string
->      : ^^^^^^
+>'div' : "div"
+>      : ^^^^^
 
   render() {
 >render : () => any
diff --git a/tests/baselines/reference/tsxDynamicTagName8.types b/tests/baselines/reference/tsxDynamicTagName8.types
index 4053cfe8fe9..b7cde99e1f6 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.types
+++ b/tests/baselines/reference/tsxDynamicTagName8.types
@@ -28,8 +28,8 @@ export class Text extends React.Component<{}, {}> {
   _tagName: string = 'div';
 >_tagName : string
 >         : ^^^^^^
->'div' : string
->      : ^^^^^^
+>'div' : "div"
+>      : ^^^^^
 
   render() {
 >render : () => any
diff --git a/tests/baselines/reference/tsxElementResolution11.types b/tests/baselines/reference/tsxElementResolution11.types
index 741f06303a6..38b3f188681 100644
--- a/tests/baselines/reference/tsxElementResolution11.types
+++ b/tests/baselines/reference/tsxElementResolution11.types
@@ -65,6 +65,6 @@ var Obj3: Obj3type;
 >     : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
diff --git a/tests/baselines/reference/tsxElementResolution12.types b/tests/baselines/reference/tsxElementResolution12.types
index 38ff05b7527..47e6d22e11d 100644
--- a/tests/baselines/reference/tsxElementResolution12.types
+++ b/tests/baselines/reference/tsxElementResolution12.types
@@ -115,8 +115,8 @@ var Obj4: Obj4type;
 >     : ^^^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 <Obj4 x={'10'} />; // Error
 ><Obj4 x={'10'} /> : JSX.Element
@@ -125,6 +125,6 @@ var Obj4: Obj4type;
 >     : ^^^^^^^^
 >x : string
 >  : ^^^^^^
->'10' : string
->     : ^^^^^^
+>'10' : "10"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/tsxElementResolution8.types b/tests/baselines/reference/tsxElementResolution8.types
index fa6e18f7e52..f1b46bce590 100644
--- a/tests/baselines/reference/tsxElementResolution8.types
+++ b/tests/baselines/reference/tsxElementResolution8.types
@@ -34,8 +34,8 @@ function Fact(): any { return null; }
 function Fnum(): number{ return 42; }
 >Fnum : () => number
 >     : ^^^^^^      
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 <Fnum />
 ><Fnum /> : JSX.Element
diff --git a/tests/baselines/reference/tsxFragmentChildrenCheck.types b/tests/baselines/reference/tsxFragmentChildrenCheck.types
index f321be46584..6f79111fba0 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.types
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.types
@@ -30,14 +30,14 @@ import { MyComponent } from './my-component'
 const MY_STRING: string = 'Ceci n\'est pas une string.'
 >MY_STRING : string
 >          : ^^^^^^
->'Ceci n\'est pas une string.' : string
->                              : ^^^^^^
+>'Ceci n\'est pas une string.' : "Ceci n'est pas une string."
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 const MY_CLASSNAME: string = 'jeclass'
 >MY_CLASSNAME : string
 >             : ^^^^^^
->'jeclass' : string
->          : ^^^^^^
+>'jeclass' : "jeclass"
+>          : ^^^^^^^^^
 
 class RenderString extends React.PureComponent<any, any> {
 >RenderString : RenderString
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.types b/tests/baselines/reference/tsxGenericAttributesType1.types
index fe637572ce8..5dbdb330b63 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.types
+++ b/tests/baselines/reference/tsxGenericAttributesType1.types
@@ -60,8 +60,8 @@ const decorator2 = function <T extends { x: number }>(Component: React.Stateless
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >Component : React.StatelessComponent<T>
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -94,8 +94,8 @@ const decorator3 = function <T extends { x: number }, U extends { x: number } >(
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >props : T & { children?: React.ReactNode; }
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Component : React.StatelessComponent<T>
diff --git a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
index 7fa2edee862..a3bf6edc1db 100644
--- a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
+++ b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
@@ -48,8 +48,8 @@ ShouldInferFromData({ data: "1" });
 >              : ^^^^^^^^^^^^^^^^^
 >data : string
 >     : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
 ShouldInferFromData({ data: "1", convert: n => "" + n });
 >ShouldInferFromData({ data: "1", convert: n => "" + n }) : JSX.Element
@@ -60,8 +60,8 @@ ShouldInferFromData({ data: "1", convert: n => "" + n });
 >                                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^
 >data : string
 >     : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >convert : (n: string) => string
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >n => "" + n : (n: string) => string
@@ -84,8 +84,8 @@ ShouldInferFromData({ data: 2, convert: n => "" + n });
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^
 >data : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >convert : (n: number) => string
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >n => "" + n : (n: number) => string
@@ -109,8 +109,8 @@ const f1 = <ShouldInferFromData data={"1"} />;
 >                    : ^ ^^     ^^        ^^^^^           
 >data : string
 >     : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
 const f2 = <ShouldInferFromData data={"1"} convert={n => "" + n} />;
 >f2 : JSX.Element
@@ -121,8 +121,8 @@ const f2 = <ShouldInferFromData data={"1"} convert={n => "" + n} />;
 >                    : ^ ^^     ^^        ^^^^^           
 >data : string
 >     : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >convert : (n: string) => string
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >n => "" + n : (n: string) => string
@@ -145,8 +145,8 @@ const f3 = <ShouldInferFromData data={2} convert={n => "" + n} />;
 >                    : ^ ^^     ^^        ^^^^^           
 >data : number
 >     : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >convert : (n: number) => string
 >        : ^ ^^^^^^^^^^^^^^^^^^^
 >n => "" + n : (n: number) => string
diff --git a/tests/baselines/reference/tsxLibraryManagedAttributes.types b/tests/baselines/reference/tsxLibraryManagedAttributes.types
index bab835d0d09..fda1fa3fe36 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.types
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.types
@@ -193,8 +193,8 @@ const a = <Component foo={12} bar="yes" baz="yeah" />;
 >          : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bar : string
 >    : ^^^^^^
 >baz : string
@@ -209,8 +209,8 @@ const b = <Component foo={12} />; // Error, missing required prop bar
 >          : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const c = <Component bar="yes" baz="yeah" />;
 >c : JSX.Element
@@ -247,8 +247,8 @@ const e = <Component foo={12} bar={null} baz="cool" />; // bar is nullable/undef
 >          : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bar : null
 >    : ^^^^
 >baz : string
@@ -263,8 +263,8 @@ const f = <Component foo={12} bar="yeah" baz={null} />; // Error, baz is _not_ n
 >          : ^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bar : string
 >    : ^^^^^^
 >baz : null
@@ -318,8 +318,8 @@ const g = <JustPropTypes foo={12} bar="ok" />;
 >              : ^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bar : string
 >    : ^^^^^^
 
@@ -354,8 +354,8 @@ const j = <JustPropTypes foo={12} bar={null} />; // error, bar is required
 >              : ^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bar : null
 >    : ^^^^
 
@@ -389,8 +389,8 @@ const k = <JustDefaultProps foo={12} />;
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const l = <JustDefaultProps foo={12} bar="ok" />; // error, no prop named bar
 >l : JSX.Element
@@ -401,8 +401,8 @@ const l = <JustDefaultProps foo={12} bar="ok" />; // error, no prop named bar
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bar : string
 >    : ^^^^^^
 
@@ -496,8 +496,8 @@ const n = <BothWithSpecifiedGeneric foo="fine" bar="yes" baz={12} />;
 >    : ^^^^^^
 >baz : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const o = <BothWithSpecifiedGeneric foo="no" />; // Error, missing required prop bar
 >o : JSX.Element
@@ -520,8 +520,8 @@ const p = <BothWithSpecifiedGeneric bar="yes" baz={12} />;
 >    : ^^^^^^
 >baz : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const q = <BothWithSpecifiedGeneric bar="yes" baz={12} bat="ohno" />; // Error, baz not a valid prop
 >q : JSX.Element
@@ -534,8 +534,8 @@ const q = <BothWithSpecifiedGeneric bar="yes" baz={12} bat="ohno" />; // Error,
 >    : ^^^^^^
 >baz : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >bat : string
 >    : ^^^^^^
 
@@ -552,8 +552,8 @@ const r = <BothWithSpecifiedGeneric foo="no" bar={null} baz={0} />; // bar is nu
 >    : ^^^^
 >baz : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const s = <BothWithSpecifiedGeneric foo="eh" bar="yeah" baz={null} />; // Error, baz is _not_ nullable/undefinable since it's marked `isRequired`
 >s : JSX.Element
@@ -628,8 +628,8 @@ const u = <JustPropTypesWithSpecifiedGeneric foo={12} />; // error, wrong type
 >                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const v = <JustPropTypesWithSpecifiedGeneric foo={null} bar="ok" />; // generic overrides propTypes required-ness, null isn't valid
 >v : JSX.Element
@@ -707,8 +707,8 @@ const z = <JustDefaultPropsWithSpecifiedGeneric foo={12} />; // error, wrong typ
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 const aa = <JustDefaultPropsWithSpecifiedGeneric />;
 >aa : JSX.Element
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
index 913c63cfea2..d68d864afe6 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
@@ -39,8 +39,8 @@ let x = <MyComp a={10} b="hi" />
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
index f971b8cebef..4b4deb85c7d 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
@@ -49,8 +49,8 @@ let x = <MyComp a={10} b="hi" />
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).types b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).types
index 91ed9f71c75..9676d2331cd 100644
--- a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).types
+++ b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).types
@@ -24,8 +24,8 @@ Symbol count: 50,000
 >    : ^^^
 >key : string
 >    : ^^^^^^
->"key-attr" : string
->           : ^^^^^^
+>"key-attr" : "key-attr"
+>           : ^^^^^^^^^^
 >div : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).types b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).types
index 91ed9f71c75..9676d2331cd 100644
--- a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).types
+++ b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).types
@@ -24,8 +24,8 @@ Symbol count: 50,000
 >    : ^^^
 >key : string
 >    : ^^^^^^
->"key-attr" : string
->           : ^^^^^^
+>"key-attr" : "key-attr"
+>           : ^^^^^^^^^^
 >div : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).types b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).types
index 2e92d0c5b7e..bb23f0c4156 100644
--- a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).types
+++ b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).types
@@ -21,8 +21,8 @@ export function T1(a: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T1" : string
->     : ^^^^^^
+>"T1" : "T1"
+>     : ^^^^
 >a : any
 >div : any
 >    : ^^^
@@ -41,8 +41,8 @@ export function T2(a: any, b: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T2" : string
->     : ^^^^^^
+>"T2" : "T2"
+>     : ^^^^
 >a : any
 >b : any
 >div : any
@@ -63,8 +63,8 @@ export function T3(a: any, b: any) {
 >a : any
 >className : string
 >          : ^^^^^^
->"T3" : string
->     : ^^^^^^
+>"T3" : "T3"
+>     : ^^^^
 >b : any
 >div : any
 >    : ^^^
@@ -83,8 +83,8 @@ export function T4(a: any, b: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T4" : string
->     : ^^^^^^
+>"T4" : "T4"
+>     : ^^^^
 >{ ...a, ...b } : any
 >a : any
 >b : any
@@ -107,8 +107,8 @@ export function T5(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T5" : string
->     : ^^^^^^
+>"T5" : "T5"
+>     : ^^^^
 >{ ...a, ...b, ...{ c, d } } : any
 >a : any
 >b : any
@@ -135,8 +135,8 @@ export function T6(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T6" : string
->     : ^^^^^^
+>"T6" : "T6"
+>     : ^^^^
 >{ ...a, ...b, ...{ ...c, ...d } } : any
 >a : any
 >b : any
@@ -179,16 +179,16 @@ export function T8(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T8" : string
->     : ^^^^^^
+>"T8" : "T8"
+>     : ^^^^
 >{ __proto__: null, dir: 'rtl' } : { __proto__: null; dir: string; }
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >__proto__ : null
 >          : ^^^^
 >dir : string
 >    : ^^^^^^
->'rtl' : string
->      : ^^^^^^
+>'rtl' : "rtl"
+>      : ^^^^^
 >div : any
 >    : ^^^
 }
@@ -208,8 +208,8 @@ export function T9(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T9" : string
->     : ^^^^^^
+>"T9" : "T9"
+>     : ^^^^
 >{ "__proto__": null } : { __proto__: null; }
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >"__proto__" : null
@@ -237,8 +237,8 @@ export function T10(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T10" : string
->      : ^^^^^^
+>"T10" : "T10"
+>      : ^^^^^
 >{ [__proto__]: null } : { [x: string]: null; }
 >                      : ^^^^^^^^^^^^^^^^^^^^^^
 >[__proto__] : null
@@ -264,8 +264,8 @@ export function T11(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T11" : string
->      : ^^^^^^
+>"T11" : "T11"
+>      : ^^^^^
 >{ ["__proto__"]: null } : { __proto__: null; }
 >                        : ^^^^^^^^^^^^^^^^^^^^
 >["__proto__"] : null
@@ -291,8 +291,8 @@ export function T12(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T12" : string
->      : ^^^^^^
+>"T12" : "T12"
+>      : ^^^^^
 >{ __proto__ } : { __proto__: string; }
 >              : ^^^^^^^^^^^^^^^^^^^^^^
 >__proto__ : string
diff --git a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).types b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).types
index 2e92d0c5b7e..bb23f0c4156 100644
--- a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).types
+++ b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).types
@@ -21,8 +21,8 @@ export function T1(a: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T1" : string
->     : ^^^^^^
+>"T1" : "T1"
+>     : ^^^^
 >a : any
 >div : any
 >    : ^^^
@@ -41,8 +41,8 @@ export function T2(a: any, b: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T2" : string
->     : ^^^^^^
+>"T2" : "T2"
+>     : ^^^^
 >a : any
 >b : any
 >div : any
@@ -63,8 +63,8 @@ export function T3(a: any, b: any) {
 >a : any
 >className : string
 >          : ^^^^^^
->"T3" : string
->     : ^^^^^^
+>"T3" : "T3"
+>     : ^^^^
 >b : any
 >div : any
 >    : ^^^
@@ -83,8 +83,8 @@ export function T4(a: any, b: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T4" : string
->     : ^^^^^^
+>"T4" : "T4"
+>     : ^^^^
 >{ ...a, ...b } : any
 >a : any
 >b : any
@@ -107,8 +107,8 @@ export function T5(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T5" : string
->     : ^^^^^^
+>"T5" : "T5"
+>     : ^^^^
 >{ ...a, ...b, ...{ c, d } } : any
 >a : any
 >b : any
@@ -135,8 +135,8 @@ export function T6(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T6" : string
->     : ^^^^^^
+>"T6" : "T6"
+>     : ^^^^
 >{ ...a, ...b, ...{ ...c, ...d } } : any
 >a : any
 >b : any
@@ -179,16 +179,16 @@ export function T8(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T8" : string
->     : ^^^^^^
+>"T8" : "T8"
+>     : ^^^^
 >{ __proto__: null, dir: 'rtl' } : { __proto__: null; dir: string; }
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >__proto__ : null
 >          : ^^^^
 >dir : string
 >    : ^^^^^^
->'rtl' : string
->      : ^^^^^^
+>'rtl' : "rtl"
+>      : ^^^^^
 >div : any
 >    : ^^^
 }
@@ -208,8 +208,8 @@ export function T9(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T9" : string
->     : ^^^^^^
+>"T9" : "T9"
+>     : ^^^^
 >{ "__proto__": null } : { __proto__: null; }
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >"__proto__" : null
@@ -237,8 +237,8 @@ export function T10(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T10" : string
->      : ^^^^^^
+>"T10" : "T10"
+>      : ^^^^^
 >{ [__proto__]: null } : { [x: string]: null; }
 >                      : ^^^^^^^^^^^^^^^^^^^^^^
 >[__proto__] : null
@@ -264,8 +264,8 @@ export function T11(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T11" : string
->      : ^^^^^^
+>"T11" : "T11"
+>      : ^^^^^
 >{ ["__proto__"]: null } : { __proto__: null; }
 >                        : ^^^^^^^^^^^^^^^^^^^^
 >["__proto__"] : null
@@ -291,8 +291,8 @@ export function T12(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T12" : string
->      : ^^^^^^
+>"T12" : "T12"
+>      : ^^^^^
 >{ __proto__ } : { __proto__: string; }
 >              : ^^^^^^^^^^^^^^^^^^^^^^
 >__proto__ : string
diff --git a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).types b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).types
index 2e92d0c5b7e..bb23f0c4156 100644
--- a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).types
+++ b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).types
@@ -21,8 +21,8 @@ export function T1(a: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T1" : string
->     : ^^^^^^
+>"T1" : "T1"
+>     : ^^^^
 >a : any
 >div : any
 >    : ^^^
@@ -41,8 +41,8 @@ export function T2(a: any, b: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T2" : string
->     : ^^^^^^
+>"T2" : "T2"
+>     : ^^^^
 >a : any
 >b : any
 >div : any
@@ -63,8 +63,8 @@ export function T3(a: any, b: any) {
 >a : any
 >className : string
 >          : ^^^^^^
->"T3" : string
->     : ^^^^^^
+>"T3" : "T3"
+>     : ^^^^
 >b : any
 >div : any
 >    : ^^^
@@ -83,8 +83,8 @@ export function T4(a: any, b: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T4" : string
->     : ^^^^^^
+>"T4" : "T4"
+>     : ^^^^
 >{ ...a, ...b } : any
 >a : any
 >b : any
@@ -107,8 +107,8 @@ export function T5(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T5" : string
->     : ^^^^^^
+>"T5" : "T5"
+>     : ^^^^
 >{ ...a, ...b, ...{ c, d } } : any
 >a : any
 >b : any
@@ -135,8 +135,8 @@ export function T6(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T6" : string
->     : ^^^^^^
+>"T6" : "T6"
+>     : ^^^^
 >{ ...a, ...b, ...{ ...c, ...d } } : any
 >a : any
 >b : any
@@ -179,16 +179,16 @@ export function T8(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T8" : string
->     : ^^^^^^
+>"T8" : "T8"
+>     : ^^^^
 >{ __proto__: null, dir: 'rtl' } : { __proto__: null; dir: string; }
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >__proto__ : null
 >          : ^^^^
 >dir : string
 >    : ^^^^^^
->'rtl' : string
->      : ^^^^^^
+>'rtl' : "rtl"
+>      : ^^^^^
 >div : any
 >    : ^^^
 }
@@ -208,8 +208,8 @@ export function T9(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T9" : string
->     : ^^^^^^
+>"T9" : "T9"
+>     : ^^^^
 >{ "__proto__": null } : { __proto__: null; }
 >                      : ^^^^^^^^^^^^^^^^^^^^
 >"__proto__" : null
@@ -237,8 +237,8 @@ export function T10(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T10" : string
->      : ^^^^^^
+>"T10" : "T10"
+>      : ^^^^^
 >{ [__proto__]: null } : { [x: string]: null; }
 >                      : ^^^^^^^^^^^^^^^^^^^^^^
 >[__proto__] : null
@@ -264,8 +264,8 @@ export function T11(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T11" : string
->      : ^^^^^^
+>"T11" : "T11"
+>      : ^^^^^
 >{ ["__proto__"]: null } : { __proto__: null; }
 >                        : ^^^^^^^^^^^^^^^^^^^^
 >["__proto__"] : null
@@ -291,8 +291,8 @@ export function T12(a: any, b: any, c: any, d: any) {
 >    : ^^^
 >className : string
 >          : ^^^^^^
->"T12" : string
->      : ^^^^^^
+>"T12" : "T12"
+>      : ^^^^^
 >{ __proto__ } : { __proto__: string; }
 >              : ^^^^^^^^^^^^^^^^^^^^^^
 >__proto__ : string
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.types b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
index 0bf3dd40288..45f80b3765f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
@@ -46,8 +46,8 @@ const obj3: {y: true, overwrite: string } = {
     overwrite: "hi"
 >overwrite : string
 >          : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 }
 
 interface Prop {
@@ -171,8 +171,8 @@ let x3 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true, x: 2, overw
 >  : ^
 >overwrite : string
 >          : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
 let x4 = <OverWriteAttr {...{x: 2}} {...{overwrite: "world"}} {...{y: true}} />
 >x4 : JSX.Element
@@ -191,8 +191,8 @@ let x4 = <OverWriteAttr {...{x: 2}} {...{overwrite: "world"}} {...{y: true}} />
 >                     : ^^^^^^^^^^^^^^^^^^^^^^
 >overwrite : string
 >          : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 >{y: true} : { y: true; }
 >          : ^^^^^^^^^^^^
 >y : true
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.types b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
index 399507e0a61..f2417f01c78 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
@@ -46,8 +46,8 @@ const obj3: {y: false, overwrite: string} = {
     overwrite: "hi"
 >overwrite : string
 >          : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 }
 
 interface Prop {
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.types b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
index 07824172b1f..a9842286c4d 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
@@ -55,8 +55,8 @@ const obj = {};
 >                  : ^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 >y : "2"
 >  : ^^^
 >"2" : "2"
@@ -104,8 +104,8 @@ let w = <Poisoned {...{x: 5, y: "2"}}/>;
 >               : ^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : "2"
 >  : ^^^
 >"2" : "2"
@@ -122,8 +122,8 @@ let w1 = <Poisoned {...{x: 5, y: "2"}} X="hi" />;
 >               : ^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >y : "2"
 >  : ^^^
 >"2" : "2"
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.types b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
index 868390012cb..ca5b1b54403 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
@@ -81,6 +81,6 @@ let y = <Poisoned x="hi" y={2} />;
 >  : ^^^^^^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.types b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
index 54a86272c10..3b7f283130f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
@@ -48,8 +48,8 @@ const obj: PoisonedProp = {
     x: "hello world",
 >x : string
 >  : ^^^^^^
->"hello world" : string
->              : ^^^^^^
+>"hello world" : "hello world"
+>              : ^^^^^^^^^^^^^
 
     y: 2
 >y : 2
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
index 85af3b2f2c4..5dbf2a767fc 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
@@ -85,8 +85,8 @@ const c2 = <OneThing yy={100}  yy1="hello"/>
 >         : ^^^ ^^                ^^^           ^^^ ^^                                   ^^^           ^^^ ^^                            ^^^           ^^^ ^^                                          ^^^           ^^^  ^^                                       ^^^           ^^^
 >yy : number
 >   : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 >yy1 : string
 >    : ^^^^^^
 
@@ -219,12 +219,12 @@ const d4 = <TestingOneThing extra-data="hello" yy={9} direction={10} />;
 >           : ^^^^^^
 >yy : number
 >   : ^^^^^^
->9 : number
->  : ^^^^^^
+>9 : 9
+>  : ^
 >direction : number
 >          : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 const d5 = <TestingOneThing extra-data="hello" yy="hello" name="Bob" />;
 >d5 : JSX.Element
@@ -297,8 +297,8 @@ const e4 = <TestingOptional y1="hello" y2={1000} />
 >   : ^^^^^^
 >y2 : number
 >   : ^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
 
 const e5 = <TestingOptional y1 y3/>
 >e5 : JSX.Element
@@ -325,8 +325,8 @@ const e6 = <TestingOptional y1 y3 y2={10} />
 >   : ^^^^
 >y2 : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 const e2 = <TestingOptional y1 y3 extra-prop/>
 >e2 : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index 2c1389ce691..f8022330bd2 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -129,14 +129,14 @@ const c5 = <OneThing {...obj1} yy={42} {...{yy1: "hi"}}/>
 >     : ^^^^^^^^^^^^^^^^
 >yy : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >{yy1: "hi"} : { yy1: string; }
 >            : ^^^^^^^^^^^^^^^^
 >yy1 : string
 >    : ^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 const c6 = <OneThing {...obj1} {...{yy: 10000, yy1: "true"}} />
 >c6 : JSX.Element
@@ -151,11 +151,11 @@ const c6 = <OneThing {...obj1} {...{yy: 10000, yy1: "true"}} />
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yy : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 >yy1 : string
 >    : ^^^^^^
->"true" : string
+>"true" : "true"
 >       : ^^^^^^
 
 const c7 = <OneThing {...defaultObj} yy {...obj} />;  // No error. should pick second overload
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
index 9fb26fe9a1b..2c18fe7f97b 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -46,8 +46,8 @@ const two2 = <ZeroThingOrTwoThing yy={100}  yy1="hello"/>;
 >                    : ^^^^^^           ^^^ ^^                            ^^       ^^       ^^^           ^^^
 >yy : number
 >   : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 >yy1 : string
 >    : ^^^^^^
 
@@ -131,8 +131,8 @@ const three1 = <ThreeThing yy={99} yy1="hello world" />;
 >           : ^^^ ^^               ^^^           ^^^ ^^               ^^^           ^^^ ^^                            ^^       ^^       ^^       ^^   ^^^           ^^^
 >yy : number
 >   : ^^^^^^
->99 : number
->   : ^^^^^^
+>99 : 99
+>   : ^^
 >yy1 : string
 >    : ^^^^^^
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
index c20e5bd2f07..54c8b20e977 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
@@ -65,8 +65,8 @@ const c1 = <OneThing yy={10}/>;  // missing property;
 >         : ^^^^^^           ^^^ ^^                            ^^^           ^^^
 >yy : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 const c2 = <OneThing {...obj} yy1 />; // type incompatible;
 >c2 : JSX.Element
@@ -265,8 +265,8 @@ const e2 = <TestingOptional y1="hello" y2={1000} y3 />
 >   : ^^^^^^
 >y2 : number
 >   : ^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
 >y3 : true
 >   : ^^^^
 
@@ -281,8 +281,8 @@ const e3 = <TestingOptional y1="hello" y2={1000} children="hi" />
 >   : ^^^^^^
 >y2 : number
 >   : ^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
 >children : string
 >         : ^^^^^^
 
@@ -297,8 +297,8 @@ const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 >   : ^^^^^^
 >y2 : number
 >   : ^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 >                : ^^^ ^^                             ^^^           ^^^ ^^                                                    ^^^           ^^^ ^^                                          ^^^           ^^^
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
index 189593c3fe2..a44c7694893 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
@@ -277,8 +277,8 @@ const b6 = <MainButton {...{ onClick(e: any){} }} children={10} />;  // incorrec
 >  : ^^^
 >children : number
 >         : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;  // incorrect type for optional attribute
 >b7 : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
index 934bfd3b4fd..9bad96ee1da 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
@@ -189,8 +189,8 @@ const b3 = <MainButton {...{to: 10000}} {...obj} />;
 >            : ^^^^^^^^^^^^^^^
 >to : number
 >   : ^^^^^^
->10000 : number
->      : ^^^^^^
+>10000 : 10000
+>      : ^^^^^
 >obj : { children: string; to: string; }
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
index 7558dc2cff3..ef82ca9b630 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
@@ -37,6 +37,6 @@ let i1 = <MyComponent1 values={5}/>;
 >             : ^ ^^^^^^^^^               ^^    ^^ ^^^^^^^^^^^^^^^^
 >values : number
 >       : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.types b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
index d1dfb698e2e..971bc1646b4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
@@ -141,8 +141,8 @@ let e = <Meet name={42} />;
 >     : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : number
 >     : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 // Error
 let f = <Meet naaaaaaame='no' />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.types b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
index 6b6a0a82b59..b2a4e39632b 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
@@ -111,8 +111,8 @@ let d = <BigGreeter ref={x => x.greeting.substr(10)} />;
 >         : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 // Error ('subtr' not on string)
 let e = <BigGreeter ref={x => x.greeting.subtr(10)} />;
@@ -174,8 +174,8 @@ let g = <BigGreeter key={100} />;
 >           : ^^^^^^^^^^^^^^^^^
 >key : number
 >    : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 // OK - contextually typed intrinsic ref callback parameter
 let h = <div ref={x => x.innerText} />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 48d9c6e5590..3afdade77b8 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -148,14 +148,14 @@ let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val) => { }}
 >       : ^^^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 >selectHandler : (val: number) => void
 >              : ^   ^^^^^^^^^^^^^^^^^
 >(val) => { } : (val: number) => void
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index f83851edf30..feda5b1af3d 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -47,8 +47,8 @@ function Bar<T extends {prop: number}>(arg: T) {
 >    : ^
 >ignore-prop : number
 >            : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
  }
 
 // Error
@@ -137,14 +137,14 @@ let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val: string)
 >       : ^^^^^^^^
 >[1, 2, 3, 4] : number[]
 >             : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 >selectHandler : (val: string) => void
 >              : ^   ^^      ^^^^^^^^^
 >(val: string) => { } : (val: string) => void
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
index 444f6062fb7..4ff0ac71dd0 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
@@ -97,8 +97,8 @@ function Bar<T extends { prop: number }>(arg: T) {
 >    : ^
 >ignore-prop : number
 >            : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     let a3 = <ComponentSpecific {...arg} prop="hello" />;   // U is "hello"
 >a3 : JSX.Element
diff --git a/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types b/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types
index 1377693dcac..c2af14aa0a5 100644
--- a/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types
+++ b/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types
@@ -29,8 +29,8 @@ function SFC<T>(props: Record<string, T>) {
 >    : ^ ^^     ^^                 ^^^^^^^^^^^
 >prop : number
 >     : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >SFC : <T>(props: Record<string, T>) => string
 >    : ^ ^^     ^^                 ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxTypeArgumentResolution.types b/tests/baselines/reference/tsxTypeArgumentResolution.types
index a30a84dd81f..e8be9ceada4 100644
--- a/tests/baselines/reference/tsxTypeArgumentResolution.types
+++ b/tests/baselines/reference/tsxTypeArgumentResolution.types
@@ -39,8 +39,8 @@ let x = <MyComp<Prop> a={10} b="hi" />; // OK
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -55,8 +55,8 @@ x = <MyComp<Prop> a={10} b="hi"></MyComp>; // OK
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >MyComp : typeof MyComp
@@ -73,12 +73,12 @@ x = <MyComp<Prop> a={10} b={20} />; // error
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 
 x = <MyComp<Prop> a={10} b={20}></MyComp>; // error
 >x = <MyComp<Prop> a={10} b={20}></MyComp> : JSX.Element
@@ -91,12 +91,12 @@ x = <MyComp<Prop> a={10} b={20}></MyComp>; // error
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : number
 >  : ^^^^^^
->20 : number
->   : ^^^^^^
+>20 : 20
+>   : ^^
 >MyComp : typeof MyComp
 >       : ^^^^^^^^^^^^^
 
@@ -111,8 +111,8 @@ x = <MyComp<Prop, Prop> a={10} b="hi" />; // error
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -127,8 +127,8 @@ x = <MyComp<Prop, Prop> a={10} b="hi"></MyComp>; // error
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >MyComp : typeof MyComp
@@ -145,8 +145,8 @@ x = <MyComp<> a={10} b="hi" />; // error
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -161,8 +161,8 @@ x = <MyComp<> a={10} b="hi"></MyComp>; // error
 >       : ^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >MyComp : typeof MyComp
@@ -255,8 +255,8 @@ x = <MyComp2<Prop> a={10} b="hi" />; // error
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 
@@ -271,8 +271,8 @@ x = <MyComp2<Prop> a={10} b="hi"></MyComp2>; // error
 >        : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : string
 >  : ^^^^^^
 >MyComp2 : typeof MyComp2
diff --git a/tests/baselines/reference/tsxUnionSpread.types b/tests/baselines/reference/tsxUnionSpread.types
index 4ecb24939d0..1b43b947f59 100644
--- a/tests/baselines/reference/tsxUnionSpread.types
+++ b/tests/baselines/reference/tsxUnionSpread.types
@@ -51,8 +51,8 @@ function getProps(): AnimalInfo {
 >      : ^^^^^
 >subType : string
 >        : ^^^^^^
->'Large' : string
->        : ^^^^^^
+>'Large' : "Large"
+>        : ^^^^^^^
 }
 
 var props:AnimalInfo = getProps();
@@ -82,8 +82,8 @@ var props2:AnimalInfo = { type: 'Cat', subType: 'Large' };
 >      : ^^^^^
 >subType : string
 >        : ^^^^^^
->'Large' : string
->        : ^^^^^^
+>'Large' : "Large"
+>        : ^^^^^^^
 
 var component2 = <AnimalComponent {...props2} />
 >component2 : error
diff --git a/tests/baselines/reference/tupleTypeInference2.types b/tests/baselines/reference/tupleTypeInference2.types
index d800eaddef8..c473953ef03 100644
--- a/tests/baselines/reference/tupleTypeInference2.types
+++ b/tests/baselines/reference/tupleTypeInference2.types
@@ -24,8 +24,8 @@ f([undefined, ''] as [never, string]); // T: never
 >                : ^^^^^^^^^^^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 f([undefined, ''] as [void, string]); // T: void
 >f([undefined, ''] as [void, string]) : void
@@ -38,8 +38,8 @@ f([undefined, ''] as [void, string]); // T: void
 >                : ^^^^^^^^^^^^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // Repro from #22563
 
diff --git a/tests/baselines/reference/tupleTypes.types b/tests/baselines/reference/tupleTypes.types
index b1a331bb681..51f39e12cc9 100644
--- a/tests/baselines/reference/tupleTypes.types
+++ b/tests/baselines/reference/tupleTypes.types
@@ -78,8 +78,8 @@ t = [1];              // Error
 >  : ^^^^^^^^^^^^^^^^
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 t = [1, "hello"];     // Ok
 >t = [1, "hello"] : [number, string]
@@ -88,10 +88,10 @@ t = [1, "hello"];     // Ok
 >  : ^^^^^^^^^^^^^^^^
 >[1, "hello"] : [number, string]
 >             : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>1 : 1
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 t = ["hello", 1];     // Error
 >t = ["hello", 1] : [string, number]
@@ -100,10 +100,10 @@ t = ["hello", 1];     // Error
 >  : ^^^^^^^^^^^^^^^^
 >["hello", 1] : [string, number]
 >             : ^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
 
 t = [1, "hello", 2];  // Error
 >t = [1, "hello", 2] : [number, string, number]
@@ -112,10 +112,10 @@ t = [1, "hello", 2];  // Error
 >  : ^^^^^^^^^^^^^^^^
 >[1, "hello", 2] : [number, string, number]
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>1 : 1
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
 >2 : 2
 >  : ^
 
@@ -126,8 +126,8 @@ var tf: [string, (x: string) => number] = ["hello", x => x.length];
 >  : ^^^^^^
 >["hello", x => x.length] : [string, (x: string) => number]
 >                         : ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >x => x.length : (x: string) => number
 >              : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -156,12 +156,12 @@ var ff1 = ff("hello", ["foo", x => x.length]);
 >                                    : ^^^^^^
 >ff : <T, U>(a: T, b: [T, (x: T) => U]) => U
 >   : ^ ^^ ^^ ^^ ^^ ^^                ^^^^^ 
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >["foo", x => x.length] : [string, (x: string) => number]
 >                       : ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 >x => x.length : (x: string) => number
 >              : ^ ^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -201,10 +201,10 @@ var tt = tuple2(1, "string");
 >                    : ^^^^^^^^^^^^^^^^
 >tuple2 : <T0, T1>(item0: T0, item1: T1) => [T0, T1]
 >       : ^  ^^  ^^     ^^  ^^     ^^  ^^^^^        
->1 : number
->  : ^^^^^^
->"string" : string
->         : ^^^^^^
+>1 : 1
+>  : ^
+>"string" : "string"
+>         : ^^^^^^^^
 
 var tt0 = tt[0];
 >tt0 : number
@@ -257,8 +257,8 @@ tt = tuple2(1, undefined);
 >                     : ^^^^^^^^^^^^^
 >tuple2 : <T0, T1>(item0: T0, item1: T1) => [T0, T1]
 >       : ^  ^^  ^^     ^^  ^^     ^^  ^^^^^        
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -269,8 +269,8 @@ tt = [1, undefined];
 >   : ^^^^^^^^^^^^^^^^
 >[1, undefined] : [number, undefined]
 >               : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >undefined : undefined
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/twiceNestedKeyofIndexInference.types b/tests/baselines/reference/twiceNestedKeyofIndexInference.types
index d0f702b28ed..d8e2f449447 100644
--- a/tests/baselines/reference/twiceNestedKeyofIndexInference.types
+++ b/tests/baselines/reference/twiceNestedKeyofIndexInference.types
@@ -72,14 +72,14 @@ const state: State = {
         b: "",
 >b : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         c: 0,
 >c : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     },
     d: false,
@@ -105,6 +105,6 @@ const newState: State = set(state, ["a", 'b'], 'why'); // shouldn't be an error
 >    : ^^^
 >'b' : "b"
 >    : ^^^
->'why' : string
->      : ^^^^^^
+>'why' : "why"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
index 11a19cf5b3a..442be2a18ba 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
@@ -164,8 +164,8 @@ var r3 = d.foo(1, 1); // boolean, last definition wins
 >  : ^^^^^^^^^^^^^^^^
 >foo : { <A>(x: A, y: A): Date; <W>(x: W, y: W): boolean; }
 >    : ^^^ ^^ ^^^^^ ^^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
index 2fc1a62eaa8..4d3f8db5ebc 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
@@ -35,8 +35,8 @@ var r2 = a(1);
 >     : ^^^^^^
 >a : A
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var r3 = a(1, 2);
 >r3 : boolean
@@ -45,10 +45,10 @@ var r3 = a(1, 2);
 >        : ^^^^^^^
 >a : A
 >  : ^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 module G {
 >G : typeof G
@@ -106,8 +106,8 @@ module G {
 >  : ^^^^^^^^^^
 >true : true
 >     : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     var r4 = a(1, true);
 >r4 : number
diff --git a/tests/baselines/reference/typeAliases.types b/tests/baselines/reference/typeAliases.types
index b3439c00efa..aaf603b51f7 100644
--- a/tests/baselines/reference/typeAliases.types
+++ b/tests/baselines/reference/typeAliases.types
@@ -285,8 +285,8 @@ var y: StringAndBoolean = ["1", false];
 >  : ^^^^^^^^^^^^^^^^
 >["1", false] : [string, false]
 >             : ^^^^^^^^^^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 >false : false
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
index 04d3ebb2267..eeff8d4312f 100644
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
@@ -38,26 +38,26 @@ var menuData: IMenuItem[] = [
         "id": "ourLogo",
 >"id" : string
 >     : ^^^^^^
->"ourLogo" : string
->          : ^^^^^^
+>"ourLogo" : "ourLogo"
+>          : ^^^^^^^^^
 
         "type": "image",
 >"type" : string
 >       : ^^^^^^
->"image" : string
->        : ^^^^^^
+>"image" : "image"
+>        : ^^^^^^^
 
         "link": "",
 >"link" : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         "icon": "modules/menu/logo.svg"
 >"icon" : string
 >       : ^^^^^^
->"modules/menu/logo.svg" : string
->                        : ^^^^^^
+>"modules/menu/logo.svg" : "modules/menu/logo.svg"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
     }, {
 >{        "id": "productName",        "type": "default",        "link": "",        "text": "Product Name"    } : { id: string; type: string; link: string; text: string; }
@@ -66,26 +66,26 @@ var menuData: IMenuItem[] = [
         "id": "productName",
 >"id" : string
 >     : ^^^^^^
->"productName" : string
->              : ^^^^^^
+>"productName" : "productName"
+>              : ^^^^^^^^^^^^^
 
         "type": "default",
 >"type" : string
 >       : ^^^^^^
->"default" : string
->          : ^^^^^^
+>"default" : "default"
+>          : ^^^^^^^^^
 
         "link": "",
 >"link" : string
 >       : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
         "text": "Product Name"
 >"text" : string
 >       : ^^^^^^
->"Product Name" : string
->               : ^^^^^^
+>"Product Name" : "Product Name"
+>               : ^^^^^^^^^^^^^^
     }
 ];
 
diff --git a/tests/baselines/reference/typeArgInference2.types b/tests/baselines/reference/typeArgInference2.types
index 49eb1fc74aa..97b3a43f178 100644
--- a/tests/baselines/reference/typeArgInference2.types
+++ b/tests/baselines/reference/typeArgInference2.types
@@ -52,8 +52,8 @@ var z4 = foo({ name: "abc" });        // { name: string }
 >                : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 var z5 = foo({ name: "abc", a: 5 });  // { name: string; a: number }
 >z5 : { name: string; a: number; }
@@ -66,12 +66,12 @@ var z5 = foo({ name: "abc", a: 5 });  // { name: string; a: number }
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 >a : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 });  // error
 >z6 : { name: string; a: number; b?: undefined; } | { name: string; b: number; a?: undefined; }
@@ -84,20 +84,20 @@ var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 });  // error
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 >a : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 >{ name: "def", b: 5 } : { name: string; b: number; }
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->"def" : string
->      : ^^^^^^
+>"def" : "def"
+>      : ^^^^^
 >b : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/typeArgInferenceWithNull.types b/tests/baselines/reference/typeArgInferenceWithNull.types
index 882af0758ad..2c6666adc68 100644
--- a/tests/baselines/reference/typeArgInferenceWithNull.types
+++ b/tests/baselines/reference/typeArgInferenceWithNull.types
@@ -64,6 +64,6 @@ fn6({ x: null }, y => { }, { x: "" }); // y has type { x: any }, but ideally wou
 >          : ^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/typeArgumentInference.types b/tests/baselines/reference/typeArgumentInference.types
index 825f5c39fed..71acdc11671 100644
--- a/tests/baselines/reference/typeArgumentInference.types
+++ b/tests/baselines/reference/typeArgumentInference.types
@@ -36,24 +36,24 @@ noGenericParams('');
 >                    : ^^^^
 >noGenericParams : <T>(n: string) => void
 >                : ^ ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 noGenericParams<number>('');
 >noGenericParams<number>('') : void
 >                            : ^^^^
 >noGenericParams : <T>(n: string) => void
 >                : ^ ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 noGenericParams<{}>('');
 >noGenericParams<{}>('') : void
 >                        : ^^^^
 >noGenericParams : <T>(n: string) => void
 >                : ^ ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // Generic call with multiple type parameters and only one used in parameter type annotation
 function someGenerics1<T, U>(n: T, m: number) { }
@@ -69,20 +69,20 @@ someGenerics1(3, 4);
 >                    : ^^^^
 >someGenerics1 : <T, U>(n: T, m: number) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 someGenerics1<number, {}>(3, 4);
 >someGenerics1<number, {}>(3, 4) : void
 >                                : ^^^^
 >someGenerics1 : <T, U>(n: T, m: number) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 // Generic call with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(n: (x: T) => void) { }
@@ -134,8 +134,8 @@ someGenerics2a<string>((n) => n.substr(0));
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 function someGenerics2b<T, U>(n: (x: T, y: U) => void) { }
 >someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
@@ -215,8 +215,8 @@ someGenerics3(() => '');
 >              : ^ ^^        ^^       ^^^^^^^^^
 >() => '' : () => string
 >         : ^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 someGenerics3<Date>(() => undefined);
 >someGenerics3<Date>(() => undefined) : void
@@ -235,8 +235,8 @@ someGenerics3<number>(() => 3);
 >              : ^ ^^        ^^       ^^^^^^^^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 function someGenerics4<T, U>(n: T, f: (x: U) => void) { }
@@ -254,8 +254,8 @@ someGenerics4(4, () => null);
 >                             : ^^^^
 >someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -264,8 +264,8 @@ someGenerics4<string, number>('', () => 3);
 >                                           : ^^^^
 >someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -293,8 +293,8 @@ someGenerics5(4, () => null);
 >                             : ^^^^
 >someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -303,8 +303,8 @@ someGenerics5<number, string>('', () => 3);
 >                                           : ^^^^
 >someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -565,14 +565,14 @@ var a9b = someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ b: '' } : { b: string; }
 >          : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9b: { a?: number; b?: string; };
 >a9b : { a?: number; b?: string; }
@@ -614,8 +614,8 @@ var a9e = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Date
 >  : ^^^^
 >new Date() : Date
@@ -626,12 +626,12 @@ var a9e = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9e: {};
 >a9e : { x: number; z: Date; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -650,8 +650,8 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Date
 >  : ^^^^
 >new Date() : Date
@@ -662,8 +662,8 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
 >'' : ""
@@ -685,20 +685,20 @@ var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
 var a9d: { x: number; };
 >a9d : { x: number; }
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
index 223306ea7e2..6bc5dd052df 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
@@ -42,24 +42,24 @@ new noGenericParams('');
 >                        : ^^^
 >noGenericParams : noGenericParams
 >                : ^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 new noGenericParams<number>('');
 >new noGenericParams<number>('') : any
 >                                : ^^^
 >noGenericParams : noGenericParams
 >                : ^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 new noGenericParams<{}>('');
 >new noGenericParams<{}>('') : any
 >                            : ^^^
 >noGenericParams : noGenericParams
 >                : ^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // Generic call with multiple type parameters and only one used in parameter type annotation
 interface someGenerics1 {
@@ -78,30 +78,30 @@ new someGenerics1(3, 4);
 >                        : ^^^
 >someGenerics1 : someGenerics1
 >              : ^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 new someGenerics1<string, number>(3, 4); // Error
 >new someGenerics1<string, number>(3, 4) : any
 >                                        : ^^^
 >someGenerics1 : someGenerics1
 >              : ^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 new someGenerics1<number, {}>(3, 4);
 >new someGenerics1<number, {}>(3, 4) : any
 >                                    : ^^^
 >someGenerics1 : someGenerics1
 >              : ^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 // Generic call with argument of function type whose parameter is of type parameter type
 interface someGenerics2a {
@@ -156,8 +156,8 @@ new someGenerics2a<string>((n) => n.substr(0));
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 interface someGenerics2b {
     new <T, U>(n: (x: T, y: U) => void);
@@ -243,8 +243,8 @@ new someGenerics3(() => '');
 >              : ^^^^^^^^^^^^^
 >() => '' : () => string
 >         : ^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 new someGenerics3<Window>(() => undefined);
 >new someGenerics3<Window>(() => undefined) : any
@@ -263,8 +263,8 @@ new someGenerics3<number>(() => 3);
 >              : ^^^^^^^^^^^^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 interface someGenerics4 {
@@ -285,8 +285,8 @@ new someGenerics4(4, () => null);
 >                                 : ^^^
 >someGenerics4 : someGenerics4
 >              : ^^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -295,8 +295,8 @@ new someGenerics4<string, number>('', () => 3);
 >                                               : ^^^
 >someGenerics4 : someGenerics4
 >              : ^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -307,8 +307,8 @@ new someGenerics4<string, number>('', (x: string) => ''); // Error
 >                                                         : ^^^
 >someGenerics4 : someGenerics4
 >              : ^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
@@ -341,8 +341,8 @@ new someGenerics5(4, () => null);
 >                                 : ^^^
 >someGenerics5 : someGenerics5
 >              : ^^^^^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -351,8 +351,8 @@ new someGenerics5<number, string>('', () => 3);
 >                                               : ^^^
 >someGenerics5 : someGenerics5
 >              : ^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -363,8 +363,8 @@ new someGenerics5<number, string>('', (x: string) => ''); // Error
 >                                                         : ^^^
 >someGenerics5 : someGenerics5
 >              : ^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
@@ -659,14 +659,14 @@ var a9b = new someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, nu
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ b: '' } : { b: string; }
 >          : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9b: { a?: number; b?: string; };
 >a9b : { a?: number; b?: string; }
@@ -708,8 +708,8 @@ var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Window & typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >window : Window & typeof globalThis
@@ -718,12 +718,12 @@ var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9e: {};
 >a9e : { x: number; z: Window & typeof globalThis; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -742,8 +742,8 @@ var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Window & typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >window : Window & typeof globalThis
@@ -752,8 +752,8 @@ var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
 >'' : ""
@@ -775,20 +775,20 @@ var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
 var a9d: { x: number; };
 >a9d : { x: number; }
diff --git a/tests/baselines/reference/typeArgumentInferenceErrors.types b/tests/baselines/reference/typeArgumentInferenceErrors.types
index 16b972ec57a..b8c7288dc66 100644
--- a/tests/baselines/reference/typeArgumentInferenceErrors.types
+++ b/tests/baselines/reference/typeArgumentInferenceErrors.types
@@ -15,10 +15,10 @@ someGenerics1<string, number>(3, 4); // Error
 >                                    : ^^^^
 >someGenerics1 : <T, U>(n: T, m: number) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 function someGenerics4<T, U>(n: T, f: (x: U) => void) { }
@@ -36,8 +36,8 @@ someGenerics4<string, number>('', (x: string) => ''); // Error
 >                                                     : ^^^^
 >someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
@@ -61,8 +61,8 @@ someGenerics5<number, string>('', (x: string) => ''); // Error
 >                                                     : ^^^^
 >someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types
index 7c0b9a5d8c4..3c859be9339 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types
@@ -27,8 +27,8 @@ foo(class { static prop = "hello" }).length;
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^
 >prop : string
 >     : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >length : number
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraints.types b/tests/baselines/reference/typeArgumentInferenceWithConstraints.types
index 836169a98c9..01917f12494 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraints.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraints.types
@@ -36,24 +36,24 @@ noGenericParams(''); // Valid
 >                    : ^^^^
 >noGenericParams : <T extends number>(n: string) => void
 >                : ^ ^^^^^^^^^      ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 noGenericParams<number>('');
 >noGenericParams<number>('') : void
 >                            : ^^^^
 >noGenericParams : <T extends number>(n: string) => void
 >                : ^ ^^^^^^^^^      ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 noGenericParams<{}>(''); // Error
 >noGenericParams<{}>('') : void
 >                        : ^^^^
 >noGenericParams : <T extends number>(n: string) => void
 >                : ^ ^^^^^^^^^      ^^ ^^      ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 // Generic call with multiple type parameters and only one used in parameter type annotation
 function someGenerics1<T, U extends T>(n: T, m: number) { }
@@ -69,40 +69,40 @@ someGenerics1(3, 4); // Valid
 >                    : ^^^^
 >someGenerics1 : <T, U extends T>(n: T, m: number) => void
 >              : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 someGenerics1<string, number>(3, 4); // Error
 >someGenerics1<string, number>(3, 4) : void
 >                                    : ^^^^
 >someGenerics1 : <T, U extends T>(n: T, m: number) => void
 >              : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 someGenerics1<number, {}>(3, 4); // Error
 >someGenerics1<number, {}>(3, 4) : void
 >                                : ^^^^
 >someGenerics1 : <T, U extends T>(n: T, m: number) => void
 >              : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 someGenerics1<number, number>(3, 4);
 >someGenerics1<number, number>(3, 4) : void
 >                                    : ^^^^
 >someGenerics1 : <T, U extends T>(n: T, m: number) => void
 >              : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^      ^^^^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
 // Generic call with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T extends string>(n: (x: T) => void) { }
@@ -154,8 +154,8 @@ someGenerics2a<string>((n) => n.substr(0));
 >  : ^^^^^^
 >substr : (from: number, length?: number) => string
 >       : ^    ^^      ^^      ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 function someGenerics2b<T extends string, U extends number>(n: (x: T, y: U) => void) { }
 >someGenerics2b : <T extends string, U extends number>(n: (x: T, y: U) => void) => void
@@ -255,8 +255,8 @@ someGenerics3<number>(() => 3); // Error
 >              : ^ ^^^^^^^^^      ^^        ^^       ^^^^^^^^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 function someGenerics4<T, U extends number>(n: T, f: (x: U) => void) { }
@@ -274,8 +274,8 @@ someGenerics4(4, () => null); // Valid
 >                             : ^^^^
 >someGenerics4 : <T, U extends number>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^              ^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -284,8 +284,8 @@ someGenerics4<string, number>('', () => 3);
 >                                           : ^^^^
 >someGenerics4 : <T, U extends number>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -296,8 +296,8 @@ someGenerics4<string, number>('', (x: string) => ''); // Error
 >                                                     : ^^^^
 >someGenerics4 : <T, U extends number>(n: T, f: (x: U) => void) => void
 >              : ^ ^^ ^^^^^^^^^      ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
@@ -327,8 +327,8 @@ someGenerics5(4, () => null); // Valid
 >                             : ^^^^
 >someGenerics5 : <U extends number, T>(n: T, f: (x: U) => void) => void
 >              : ^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 >() => null : () => any
 >           : ^^^^^^^^^
 
@@ -337,8 +337,8 @@ someGenerics5<number, string>('', () => 3);
 >                                           : ^^^^
 >someGenerics5 : <U extends number, T>(n: T, f: (x: U) => void) => void
 >              : ^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >() => 3 : () => number
 >        : ^^^^^^^^^^^^
 >3 : 3
@@ -349,8 +349,8 @@ someGenerics5<number, string>('', (x: string) => ''); // Error
 >                                                     : ^^^^
 >someGenerics5 : <U extends number, T>(n: T, f: (x: U) => void) => void
 >              : ^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^              ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >(x: string) => '' : (x: string) => string
 >                  : ^ ^^      ^^^^^^^^^^^
 >x : string
@@ -637,14 +637,14 @@ var a9b = someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >{ b: '' } : { b: string; }
 >          : ^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9b: { a?: number; b?: string; };
 >a9b : { a?: number; b?: string; }
@@ -686,8 +686,8 @@ var a9e = someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Window & typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >window : Window & typeof globalThis
@@ -696,12 +696,12 @@ var a9e = someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var a9e: {};
 >a9e : { x: number; z: Window & typeof globalThis; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -720,8 +720,8 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >z : Window & typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >window : Window & typeof globalThis
@@ -730,8 +730,8 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >y : string
 >  : ^^^^^^
 >'' : ""
@@ -753,20 +753,20 @@ var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 >{ x: 6 } : { x: number; }
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->6 : number
->  : ^^^^^^
+>6 : 6
+>  : ^
 
 var a9d: { x: number; };
 >a9d : { x: number; }
diff --git a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
index 46970e19180..aba0e382f6a 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
@@ -140,10 +140,10 @@ var v1 = f1({ w: x => x, r: () => 0 }, 0);
 >  : ^^^^^^^^^^^^
 >() => 0 : () => number
 >        : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 var v1 = f1({ w: x => x, r: () => 0 }, E1.X);
 >v1 : number
@@ -166,8 +166,8 @@ var v1 = f1({ w: x => x, r: () => 0 }, E1.X);
 >  : ^^^^^^^^^^^^
 >() => 0 : () => number
 >        : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >E1.X : E1
 >     : ^^
 >E1 : typeof E1
diff --git a/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types b/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types
index 83cf0da87df..cd64f6c52d7 100644
--- a/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types
+++ b/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types
@@ -31,8 +31,8 @@ var x: number = foo<string>("hi"); // return type should be 'number'
 >                  : ^^^^^^
 >foo : { (a: string): string; <T>(a: T): number; }
 >    : ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^      ^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 var y: string = foo("hi"); // return type should be 'string'
 >y : string
@@ -41,8 +41,8 @@ var y: string = foo("hi"); // return type should be 'string'
 >          : ^^^^^^
 >foo : { (a: string): string; <T>(a: T): number; }
 >    : ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^      ^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 var w: string = foo<string>("hi"); // should error
 >w : string
@@ -51,8 +51,8 @@ var w: string = foo<string>("hi"); // should error
 >                  : ^^^^^^
 >foo : { (a: string): string; <T>(a: T): number; }
 >    : ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^      ^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 var z: number = foo("hi"); // should error
 >z : number
@@ -61,6 +61,6 @@ var z: number = foo("hi"); // should error
 >          : ^^^^^^
 >foo : { (a: string): string; <T>(a: T): number; }
 >    : ^^^ ^^      ^^^      ^^^ ^^ ^^ ^^^      ^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/typeAssertionToGenericFunctionType.types b/tests/baselines/reference/typeAssertionToGenericFunctionType.types
index d584b16146f..0654ab1bae0 100644
--- a/tests/baselines/reference/typeAssertionToGenericFunctionType.types
+++ b/tests/baselines/reference/typeAssertionToGenericFunctionType.types
@@ -42,8 +42,8 @@ x.a<string>(1); // bug was that this caused 'Could not find symbol T' on return
 >  : ^^^^^              ^^^^^^ ^^ ^^ ^^^^^^^^^^^^
 >a : <T>(x: T) => T
 >  : ^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 x.b<string>(); // error
 >x.b<string>() : void
diff --git a/tests/baselines/reference/typeCheckExportsVariable.types b/tests/baselines/reference/typeCheckExportsVariable.types
index ddb297997e9..a510d4b4315 100644
--- a/tests/baselines/reference/typeCheckExportsVariable.types
+++ b/tests/baselines/reference/typeCheckExportsVariable.types
@@ -6,10 +6,10 @@ let exports: number;
 >        : ^^^^^^
 
 exports = '';
->exports = '' : string
->             : ^^^^^^
+>exports = '' : ""
+>             : ^^
 >exports : number
 >        : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.types b/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.types
index 1b1404d0cea..930f856e8fb 100644
--- a/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.types
+++ b/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.types
@@ -12,8 +12,8 @@ var functions = [function () {
   var k: string = 10;
 >k : string
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     k = new Object();
 >k = new Object() : Object
diff --git a/tests/baselines/reference/typeFromJSInitializer.errors.txt b/tests/baselines/reference/typeFromJSInitializer.errors.txt
index 8d357ca336f..f52bed8fa80 100644
--- a/tests/baselines/reference/typeFromJSInitializer.errors.txt
+++ b/tests/baselines/reference/typeFromJSInitializer.errors.txt
@@ -3,10 +3,10 @@ a.js(4,5): error TS7008: Member 'unknowable' implicitly has an 'any' type.
 a.js(5,5): error TS7008: Member 'empty' implicitly has an 'any[]' type.
 a.js(25,29): error TS7006: Parameter 'l' implicitly has an 'any[]' type.
 a.js(27,5): error TS2322: Type 'undefined' is not assignable to type 'null'.
-a.js(29,5): error TS2322: Type 'number' is not assignable to type 'null'.
+a.js(29,5): error TS2322: Type '1' is not assignable to type 'null'.
 a.js(30,5): error TS2322: Type 'true' is not assignable to type 'null'.
 a.js(31,5): error TS2322: Type '{}' is not assignable to type 'null'.
-a.js(32,5): error TS2322: Type 'string' is not assignable to type 'null'.
+a.js(32,5): error TS2322: Type '"ok"' is not assignable to type 'null'.
 a.js(37,5): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
@@ -51,7 +51,7 @@ a.js(37,5): error TS2322: Type 'string' is not assignable to type 'number'.
         a = null
         a = 1
         ~
-!!! error TS2322: Type 'number' is not assignable to type 'null'.
+!!! error TS2322: Type '1' is not assignable to type 'null'.
         a = true
         ~
 !!! error TS2322: Type 'true' is not assignable to type 'null'.
@@ -60,7 +60,7 @@ a.js(37,5): error TS2322: Type 'string' is not assignable to type 'number'.
 !!! error TS2322: Type '{}' is not assignable to type 'null'.
         a = 'ok'
         ~
-!!! error TS2322: Type 'string' is not assignable to type 'null'.
+!!! error TS2322: Type '"ok"' is not assignable to type 'null'.
     
         // b should be number | undefined, not any
         b = 1
diff --git a/tests/baselines/reference/typeFromJSInitializer.types b/tests/baselines/reference/typeFromJSInitializer.types
index aac6375b2f5..7c6828fc674 100644
--- a/tests/baselines/reference/typeFromJSInitializer.types
+++ b/tests/baselines/reference/typeFromJSInitializer.types
@@ -244,12 +244,12 @@ function f(a = null, b = n, l = []) {
 >  : ^^^^
 
     a = 1
->a = 1 : number
->      : ^^^^^^
+>a = 1 : 1
+>      : ^
 >a : null
 >  : ^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     a = true
 >a = true : true
@@ -268,21 +268,21 @@ function f(a = null, b = n, l = []) {
 >   : ^^
 
     a = 'ok'
->a = 'ok' : string
->         : ^^^^^^
+>a = 'ok' : "ok"
+>         : ^^^^
 >a : null
 >  : ^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 
     // b should be number | undefined, not any
     b = 1
->b = 1 : number
->      : ^^^^^^
+>b = 1 : 1
+>      : ^
 >b : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     b = undefined
 >b = undefined : undefined
@@ -293,12 +293,12 @@ function f(a = null, b = n, l = []) {
 >          : ^^^^^^^^^
 
     b = 'error'
->b = 'error' : string
->            : ^^^^^^
+>b = 'error' : "error"
+>            : ^^^^^^^
 >b : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->'error' : string
->        : ^^^^^^
+>'error' : "error"
+>        : ^^^^^^^
 
     // l should be any[]
     l.push(1)
diff --git a/tests/baselines/reference/typeFromJSInitializer4.types b/tests/baselines/reference/typeFromJSInitializer4.types
index 0155099d2e0..4ffbd5acc3d 100644
--- a/tests/baselines/reference/typeFromJSInitializer4.types
+++ b/tests/baselines/reference/typeFromJSInitializer4.types
@@ -70,12 +70,12 @@ function f(a = null, b = n, l = []) {
 
     // b should be number | undefined, not any
     b = 1
->b = 1 : number
->      : ^^^^^^
+>b = 1 : 1
+>      : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     b = undefined
 >b = undefined : undefined
@@ -86,12 +86,12 @@ function f(a = null, b = n, l = []) {
 >          : ^^^^^^^^^
 
     b = 'error'
->b = 'error' : string
->            : ^^^^^^
+>b = 'error' : "error"
+>            : ^^^^^^^
 >b : number
 >  : ^^^^^^
->'error' : string
->        : ^^^^^^
+>'error' : "error"
+>        : ^^^^^^^
 
     // l should be any[]
     l.push(1)
diff --git a/tests/baselines/reference/typeFromParamTagForFunction.types b/tests/baselines/reference/typeFromParamTagForFunction.types
index 43a67debe00..b42118d9ef2 100644
--- a/tests/baselines/reference/typeFromParamTagForFunction.types
+++ b/tests/baselines/reference/typeFromParamTagForFunction.types
@@ -45,8 +45,8 @@ const { A } = require("./a-ext");
 >                   : ^^^^^^^^^^^^^^^^^^^^^^
 >require : (id: string) => any
 >        : ^  ^^      ^^^^^   
->"./a-ext" : string
->          : ^^^^^^
+>"./a-ext" : "./a-ext"
+>          : ^^^^^^^^^
 
 /** @param {A} p */
 function a(p) { p.x; }
@@ -96,8 +96,8 @@ const { B } = require("./b-ext");
 >                   : ^^^^^^^^^^^^^^^^^^^^^^
 >require : (id: string) => any
 >        : ^  ^^      ^^^^^   
->"./b-ext" : string
->          : ^^^^^^
+>"./b-ext" : "./b-ext"
+>          : ^^^^^^^^^
 
 /** @param {B} p */
 function b(p) { p.x; }
@@ -137,8 +137,8 @@ const { C } = require("./c-ext");
 >                   : ^^^^^^^^^^^^^^^^^^^^^^
 >require : (id: string) => any
 >        : ^  ^^      ^^^^^   
->"./c-ext" : string
->          : ^^^^^^
+>"./c-ext" : "./c-ext"
+>          : ^^^^^^^^^
 
 /** @param {C} p */
 function c(p) { p.x; }
@@ -181,8 +181,8 @@ const { D } = require("./d-ext");
 >                   : ^^^^^^^^^^^^^^^^^^^^^^
 >require : (id: string) => any
 >        : ^  ^^      ^^^^^   
->"./d-ext" : string
->          : ^^^^^^
+>"./d-ext" : "./d-ext"
+>          : ^^^^^^^^^
 
 /** @param {D} p */
 function d(p) { p.x; }
@@ -224,8 +224,8 @@ const { E } = require("./e-ext");
 >                   : ^^^^^^^^^^^^^^^^^^^^^^
 >require : (id: string) => any
 >        : ^  ^^      ^^^^^   
->"./e-ext" : string
->          : ^^^^^^
+>"./e-ext" : "./e-ext"
+>          : ^^^^^^^^^
 
 /** @param {E} p */
 function e(p) { p.x; }
diff --git a/tests/baselines/reference/typeFromPropertyAssignment10.types b/tests/baselines/reference/typeFromPropertyAssignment10.types
index ca99598482e..5771291b2fc 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment10.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment10.types
@@ -86,16 +86,16 @@ Outer.app.Inner = class {
     constructor() {
         /** @type {number} */
         this.y = 12;
->this.y = 12 : number
->            : ^^^^^^
+>this.y = 12 : 12
+>            : ^^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
     }
 }
 var example = new Outer.app.Inner();
@@ -278,6 +278,6 @@ Outer.app.statische(101); // Infinity, duh
 >    : ^^^^^^^^^^^^^^^^
 >statische : (k: number) => number
 >          : ^ ^^      ^^^^^^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment10_1.types b/tests/baselines/reference/typeFromPropertyAssignment10_1.types
index ce3825bf424..8a3e0ae3431 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment10_1.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment10_1.types
@@ -86,16 +86,16 @@ Outer.app.Inner = class {
     constructor() {
         /** @type {number} */
         this.y = 12;
->this.y = 12 : number
->            : ^^^^^^
+>this.y = 12 : 12
+>            : ^^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
     }
 }
 var example = new Outer.app.Inner();
@@ -278,6 +278,6 @@ Outer.app.statische(101); // Infinity, duh
 >    : ^^^^^^^^^^^^^^^^
 >statische : (k: number) => number
 >          : ^ ^^      ^^^^^^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.types b/tests/baselines/reference/typeFromPropertyAssignment29.types
index 571464d3001..24b9cb40ac2 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment29.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment29.types
@@ -72,16 +72,16 @@ var n = ExpandoDecl.prop + ExpandoDecl.m(12) + ExpandoDecl(101).length
 >            : ^^^^^^^^^^^^^^^^^^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >ExpandoDecl(101).length : number
 >                        : ^^^^^^
 >ExpandoDecl(101) : string
 >                 : ^^^^^^
 >ExpandoDecl : typeof ExpandoDecl
 >            : ^^^^^^^^^^^^^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
 >length : number
 >       : ^^^^^^
 
@@ -164,10 +164,10 @@ var n = (ExpandoExpr.prop.x || 0) + ExpandoExpr.m(12) + ExpandoExpr(101).length
 >                                                                        : ^^^^^^
 >(ExpandoExpr.prop.x || 0) + ExpandoExpr.m(12) : number
 >                                              : ^^^^^^
->(ExpandoExpr.prop.x || 0) : number
->                          : ^^^^^^
->ExpandoExpr.prop.x || 0 : number
->                        : ^^^^^^
+>(ExpandoExpr.prop.x || 0) : 0
+>                          : ^
+>ExpandoExpr.prop.x || 0 : 0
+>                        : ^
 >ExpandoExpr.prop.x : undefined
 >                   : ^^^^^^^^^
 >ExpandoExpr.prop : { y: string; x?: undefined; }
@@ -178,8 +178,8 @@ var n = (ExpandoExpr.prop.x || 0) + ExpandoExpr.m(12) + ExpandoExpr(101).length
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : undefined
 >  : ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >ExpandoExpr.m(12) : number
 >                  : ^^^^^^
 >ExpandoExpr.m : (n: number) => number
@@ -188,16 +188,16 @@ var n = (ExpandoExpr.prop.x || 0) + ExpandoExpr.m(12) + ExpandoExpr(101).length
 >            : ^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >ExpandoExpr(101).length : number
 >                        : ^^^^^^
 >ExpandoExpr(101) : string
 >                 : ^^^^^^
 >ExpandoExpr : { (n: number): string; prop: { x: number; y?: undefined; } | { y: string; x?: undefined; }; m(n: number): number; }
 >            : ^^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
 >length : number
 >       : ^^^^^^
 
@@ -387,8 +387,8 @@ var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge(1);
 >                : ^^^^^^
 >ExpandoMerge : typeof ExpandoMerge
 >             : ^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 namespace Ns {
 >Ns : typeof Ns
@@ -502,8 +502,8 @@ var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length
 >                  : ^^^^^^
 >ExpandoExpr2 : (n: number) => string
 >             : ^ ^^      ^^^^^^^^^^^
->101 : number
->    : ^^^^^^
+>101 : 101
+>    : ^^^
 >length : number
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment30.types b/tests/baselines/reference/typeFromPropertyAssignment30.types
index 8fbccdfeba9..4959800e3d2 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment30.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment30.types
@@ -14,8 +14,8 @@ const c: Combo = () => 1
 >  : ^^^^^
 >() => 1 : { (): number; p: {}; }
 >        : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // should not be an expando object, but contextually typed by Combo.p
 c.p = {}
diff --git a/tests/baselines/reference/typeFromPropertyAssignment31.types b/tests/baselines/reference/typeFromPropertyAssignment31.types
index 53ffaa21224..a8c09511396 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment31.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment31.types
@@ -258,12 +258,12 @@ var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 +
 >             : ^^^^^^^^^^^^^^^^^^^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >ExpandoMerge(1001) : number
 >                   : ^^^^^^
 >ExpandoMerge : typeof ExpandoMerge
 >             : ^^^^^^^^^^^^^^^^^^^
->1001 : number
->     : ^^^^^^
+>1001 : 1001
+>     : ^^^^
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment32.types b/tests/baselines/reference/typeFromPropertyAssignment32.types
index e04cb568e5d..4139784165b 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment32.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment32.types
@@ -202,14 +202,14 @@ var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 +
 >             : ^^^^^^^^^^^^^^^^^^^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >ExpandoMerge(1001) : number
 >                   : ^^^^^^
 >ExpandoMerge : typeof ExpandoMerge
 >             : ^^^^^^^^^^^^^^^^^^^
->1001 : number
->     : ^^^^^^
+>1001 : 1001
+>     : ^^^^
 
 === ns.ts ===
 namespace ExpandoMerge {
diff --git a/tests/baselines/reference/typeFromPropertyAssignment33.types b/tests/baselines/reference/typeFromPropertyAssignment33.types
index e613eef064e..fe540e93c7d 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment33.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment33.types
@@ -261,13 +261,13 @@ var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 +
 >             : ^^^^^^^^^^^^^^^^^^^
 >m : (n: number) => number
 >  : ^ ^^      ^^^^^^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 >ExpandoMerge(1001) : number
 >                   : ^^^^^^
 >ExpandoMerge : typeof ExpandoMerge
 >             : ^^^^^^^^^^^^^^^^^^^
->1001 : number
->     : ^^^^^^
+>1001 : 1001
+>     : ^^^^
 
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment4.types b/tests/baselines/reference/typeFromPropertyAssignment4.types
index 19be5683391..389ee8f941c 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment4.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment4.types
@@ -23,16 +23,16 @@ Outer.Inner = class {
     constructor() {
         /** @type {number} */
         this.y = 12
->this.y = 12 : number
->            : ^^^^^^
+>this.y = 12 : 12
+>            : ^^
 >this.y : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >y : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/typeFromPrototypeAssignment3.types b/tests/baselines/reference/typeFromPrototypeAssignment3.types
index 94bf0fdb410..d419ef4d350 100644
--- a/tests/baselines/reference/typeFromPrototypeAssignment3.types
+++ b/tests/baselines/reference/typeFromPrototypeAssignment3.types
@@ -79,6 +79,6 @@ const n = map.get('hi')
 >    : ^^^^^^^^^
 >get : (key: string) => number
 >    : ^   ^^      ^^^^^      
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/typeFromPrototypeAssignment4.types b/tests/baselines/reference/typeFromPrototypeAssignment4.types
index b5383545012..accadb79b92 100644
--- a/tests/baselines/reference/typeFromPrototypeAssignment4.types
+++ b/tests/baselines/reference/typeFromPrototypeAssignment4.types
@@ -119,8 +119,8 @@ map4.get("");
 >     : ^^^^^^^^^
 >get : (key: string) => number
 >    : ^   ^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 map4["add-on"]();
 >map4["add-on"]() : void
diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.types b/tests/baselines/reference/typeGuardFunctionGenerics.types
index 8c6fc5ffdc1..58df2241c78 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.types
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.types
@@ -153,6 +153,6 @@ let test3: B = funE(isB, 1);
 >     : ^ ^^ ^^  ^^     ^^^            ^^  ^^ ^^^^^ 
 >isB : (p1: any) => p1 is B
 >    : ^  ^^^^^^^^^^       
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/typeGuardIntersectionTypes.types b/tests/baselines/reference/typeGuardIntersectionTypes.types
index 80ca7112379..5754943f054 100644
--- a/tests/baselines/reference/typeGuardIntersectionTypes.types
+++ b/tests/baselines/reference/typeGuardIntersectionTypes.types
@@ -261,8 +261,8 @@ function identifyBeast(beast: Beast) {
 >                               : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->`pegasus - 4 legs, wings` : string
->                          : ^^^^^^
+>`pegasus - 4 legs, wings` : "pegasus - 4 legs, wings"
+>                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
             }
             else if (beast.legs === 2) {
 >beast.legs === 2 : boolean
@@ -281,8 +281,8 @@ function identifyBeast(beast: Beast) {
 >                            : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->`bird - 2 legs, wings` : string
->                       : ^^^^^^
+>`bird - 2 legs, wings` : "bird - 2 legs, wings"
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
             }
             else {
                 log(`unknown - ${beast.legs} legs, wings`);
@@ -334,8 +334,8 @@ function identifyBeast(beast: Beast) {
 >                                     : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->`quetzalcoatl - no legs, wings` : string
->                                : ^^^^^^
+>`quetzalcoatl - no legs, wings` : "quetzalcoatl - no legs, wings"
+>                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
         else {
             log(`snake - no legs, no wings`)
@@ -343,8 +343,8 @@ function identifyBeast(beast: Beast) {
 >                                 : ^^^^
 >log : (s: string) => void
 >    : ^ ^^      ^^^^^    
->`snake - no legs, no wings` : string
->                            : ^^^^^^
+>`snake - no legs, no wings` : "snake - no legs, no wings"
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
         }
     }
 }
diff --git a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty1.types b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty1.types
index 51bfc56f994..cfa4c5ea7ae 100644
--- a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty1.types
+++ b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty1.types
@@ -492,7 +492,7 @@ export function g(pair: [number, string?]): string {
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >1 : 1
 >  : ^
->'nope' : string
+>'nope' : "nope"
 >       : ^^^^^^
 }
 
diff --git a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty3.types b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty3.types
index 3a60ef4e338..d547c526f2a 100644
--- a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty3.types
+++ b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty3.types
@@ -10,12 +10,12 @@ const foo: Foo = [1, 2, 3];
 >    : ^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 const index = 1;
 >index : 1
diff --git a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty4.types b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty4.types
index 8e38620003c..5351c7c66c5 100644
--- a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty4.types
+++ b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty4.types
@@ -11,16 +11,16 @@ class Foo {
 
     constructor() {
         this.x = 5;
->this.x = 5 : number
->           : ^^^^^^
+>this.x = 5 : 5
+>           : ^
 >this.x : number | undefined
 >       : ^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >x : number | undefined
 >  : ^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
         this.x;    // number
 >this.x : number
diff --git a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty7.types b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty7.types
index 4bc41e40667..247b174aae5 100644
--- a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty7.types
+++ b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty7.types
@@ -30,8 +30,8 @@ export class C {
 
     constructor() {
         this[Foo.key] = "hello";
->this[Foo.key] = "hello" : string
->                        : ^^^^^^
+>this[Foo.key] = "hello" : "hello"
+>                        : ^^^^^^^
 >this[Foo.key] : string
 >              : ^^^^^^
 >this : this
@@ -42,8 +42,8 @@ export class C {
 >    : ^^^^^^^^^^
 >key : unique symbol
 >    : ^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty8.types b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty8.types
index c4957cf1fec..966c6e79ba4 100644
--- a/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty8.types
+++ b/tests/baselines/reference/typeGuardNarrowsIndexedAccessOfKnownProperty8.types
@@ -28,8 +28,8 @@ export class C {
 
     constructor() {
         this[a.key] = "foo";
->this[a.key] = "foo" : string
->                    : ^^^^^^
+>this[a.key] = "foo" : "foo"
+>                    : ^^^^^
 >this[a.key] : string
 >            : ^^^^^^
 >this : this
@@ -40,8 +40,8 @@ export class C {
 >  : ^^^^^^^^
 >key : "a"
 >    : ^^^
->"foo" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
     }
 }
 
diff --git a/tests/baselines/reference/typeGuardNesting.types b/tests/baselines/reference/typeGuardNesting.types
index 4613eae38d7..21b98b5963b 100644
--- a/tests/baselines/reference/typeGuardNesting.types
+++ b/tests/baselines/reference/typeGuardNesting.types
@@ -50,8 +50,8 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >         : ^^^^^^^^
 >strOrBool : string
 >          : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
 >bool : boolean
@@ -90,8 +90,8 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >          : ^^^^^^^^^
 >strOrBool : string
 >          : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
 >bool2 : boolean
@@ -159,8 +159,8 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >         : ^^^^^^^^
 >strOrBool : string
 >          : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
 >bool : boolean
@@ -199,8 +199,8 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >          : ^^^^^^^^^
 >strOrBool : string
 >          : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
 	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
 >bool2 : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormFunctionEquality.types b/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
index fb7a2f422ed..8979501075b 100644
--- a/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
+++ b/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
@@ -20,8 +20,8 @@ switch (isString1(0, "")) {
 >                 : ^^^^^^^
 >isString1 : (a: number, b: Object) => b is string
 >          : ^ ^^      ^^ ^^      ^^^^^           
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >"" : ""
 >   : ^^
 
@@ -45,8 +45,8 @@ var x = isString1(0, "") === isString2("");
 >                 : ^^^^^^^
 >isString1 : (a: number, b: Object) => b is string
 >          : ^ ^^      ^^ ^^      ^^^^^           
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >"" : ""
 >   : ^^
 >isString2("") : boolean
@@ -71,8 +71,8 @@ function isString3(a: number, b: number, c: Object): c is string {
 >                : ^^^^^^^
 >isString1 : (a: number, b: Object) => b is string
 >          : ^ ^^      ^^ ^^      ^^^^^           
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >c : Object
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types
index 0d7de75bb2d..c81aba9070e 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.types
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.types
@@ -96,10 +96,10 @@ namespace Test {
 >                               : ^^^^
 >File : typeof File
 >     : ^^^^^^^^^^^
->"foo/bar.txt" : string
->              : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo/bar.txt" : "foo/bar.txt"
+>              : ^^^^^^^^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 	file.isNetworked = false;
 >file.isNetworked = false : false
diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types
index 8005b90309a..31d51f96656 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types
@@ -96,10 +96,10 @@ namespace Test {
 >                               : ^^^^
 >File : typeof File
 >     : ^^^^^^^^^^^
->"foo/bar.txt" : string
->              : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo/bar.txt" : "foo/bar.txt"
+>              : ^^^^^^^^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 
 	file.isNetworked = file.isFile;
 >file.isNetworked = file.isFile : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
index fe1fbe0bd20..5acd032dc4a 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
@@ -144,8 +144,8 @@ if (typeof strOrC === "Object" as string) { // comparison is OK with cast
 >       : ^^^^^^^^^^
 >"Object" as string : string
 >                   : ^^^^^^
->"Object" : string
->         : ^^^^^^
+>"Object" : "Object"
+>         : ^^^^^^^^
 
     c = strOrC; // error: but no narrowing to C
 >c = strOrC : string | C
diff --git a/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types b/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types
index d24e89d2004..53cabd1ce88 100644
--- a/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types
+++ b/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types
@@ -40,29 +40,29 @@ function namedClasses(x: A | B) {
 >  : ^^^^^
 
         x.a = "1";
->x.a = "1" : string
->          : ^^^^^^
+>x.a = "1" : "1"
+>          : ^^^
 >x.a : string
 >    : ^^^^^^
 >x : A
 >  : ^
 >a : string
 >  : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
     } else {
         x.b = 1;
->x.b = 1 : number
->        : ^^^^^^
+>x.b = 1 : 1
+>        : ^
 >x.b : number
 >    : ^^^^^^
 >x : B
 >  : ^
 >b : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
@@ -171,16 +171,16 @@ function positiveTestClassesWithOptionalProperties(x: AWithOptionalProp | BWithO
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         x.a = "1";
->x.a = "1" : string
->          : ^^^^^^
+>x.a = "1" : "1"
+>          : ^^^
 >x.a : string
 >    : ^^^^^^
 >x : AWithOptionalProp
 >  : ^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"1" : string
->    : ^^^^^^
+>"1" : "1"
+>    : ^^^
 
     } else {
         const y: string = x instanceof AWithOptionalProp
diff --git a/tests/baselines/reference/typeGuardsAsAssertions.types b/tests/baselines/reference/typeGuardsAsAssertions.types
index ab51e42e30c..a012e895329 100644
--- a/tests/baselines/reference/typeGuardsAsAssertions.types
+++ b/tests/baselines/reference/typeGuardsAsAssertions.types
@@ -26,8 +26,8 @@ export const none : None = { none: '' };
 >             : ^^^^^^^^^^^^^^^^^
 >none : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 export function isSome<a>(value: Optional<a>): value is Some<a> {
 >isSome : <a>(value: Optional<a>) => value is Some<a>
@@ -419,12 +419,12 @@ function f6() {
 >      : ^     ^^^      ^^   ^^^      ^^^^^      
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | null | undefined
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     x!.slice();
 >x!.slice() : string
@@ -505,8 +505,8 @@ function f6() {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 ><string | undefined>"" : string | undefined
 >                       : ^^^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     x!.slice();
 >x!.slice() : string
@@ -527,8 +527,8 @@ function f6() {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 ><string | null>"" : string | null
 >                  : ^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     x!.slice();
 >x!.slice() : string
diff --git a/tests/baselines/reference/typeGuardsDefeat.types b/tests/baselines/reference/typeGuardsDefeat.types
index 75c61587d8b..a0cd504c165 100644
--- a/tests/baselines/reference/typeGuardsDefeat.types
+++ b/tests/baselines/reference/typeGuardsDefeat.types
@@ -14,12 +14,12 @@ function foo(x: number | string) {
 >  : ^^^^^^^^^^
 
         x = 10;
->x = 10 : number
->       : ^^^^^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
     }
     if (typeof x === "string") {
 >typeof x === "string" : boolean
@@ -95,12 +95,12 @@ function foo2(x: number | string) {
         };
     }
     x = "hello";
->x = "hello" : string
->            : ^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     f();
 >f() : number
@@ -146,12 +146,12 @@ function foo3(x: number | string) {
 >  : ^^^^^^^^^^^^^^^
     }
     x = "hello";
->x = "hello" : string
->            : ^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     f();
 >f() : number
diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.types b/tests/baselines/reference/typeGuardsInConditionalExpression.types
index 73e3becbff8..e5dfece3657 100644
--- a/tests/baselines/reference/typeGuardsInConditionalExpression.types
+++ b/tests/baselines/reference/typeGuardsInConditionalExpression.types
@@ -63,14 +63,14 @@ function foo2(x: number | string) {
 >                     : ^^^^^^
 >(x = "hello") && x : string
 >                   : ^^^^^^
->(x = "hello") : string
->              : ^^^^^^
->x = "hello" : string
->            : ^^^^^^
+>(x = "hello") : "hello"
+>              : ^^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >x : string
 >  : ^^^^^^
 
@@ -101,14 +101,14 @@ function foo3(x: number | string) {
 >                : ^^^^^^
 >(x = 10) && x : number
 >              : ^^^^^^
->(x = 10) : number
->         : ^^^^^^
->x = 10 : number
->       : ^^^^^^
+>(x = 10) : 10
+>         : ^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >x : number
 >  : ^^^^^^
 
@@ -143,14 +143,14 @@ function foo4(x: number | string) {
 >                : ^^^^^^
 >(x = 10) && x : number
 >              : ^^^^^^
->(x = 10) : number
->         : ^^^^^^
->x = 10 : number
->       : ^^^^^^
+>(x = 10) : 10
+>         : ^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >x : number
 >  : ^^^^^^
 }
@@ -181,14 +181,14 @@ function foo5(x: number | string) {
 >                     : ^^^^^^
 >(x = "hello") && x : string
 >                   : ^^^^^^
->(x = "hello") : string
->              : ^^^^^^
->x = "hello" : string
->            : ^^^^^^
+>(x = "hello") : "hello"
+>              : ^^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >x : string
 >  : ^^^^^^
 }
@@ -216,14 +216,14 @@ function foo6(x: number | string) {
 >                : ^^^^^^
 >(x = 10) && x : number
 >              : ^^^^^^
->(x = 10) : number
->         : ^^^^^^
->x = 10 : number
->       : ^^^^^^
+>(x = 10) : 10
+>         : ^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >x : number
 >  : ^^^^^^
 
@@ -232,14 +232,14 @@ function foo6(x: number | string) {
 >                     : ^^^^^^
 >(x = "hello") && x : string
 >                   : ^^^^^^
->(x = "hello") : string
->              : ^^^^^^
->x = "hello" : string
->            : ^^^^^^
+>(x = "hello") : "hello"
+>              : ^^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >x : string
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/typeGuardsInDoStatement.types b/tests/baselines/reference/typeGuardsInDoStatement.types
index 9df5a108468..4279f417e0a 100644
--- a/tests/baselines/reference/typeGuardsInDoStatement.types
+++ b/tests/baselines/reference/typeGuardsInDoStatement.types
@@ -98,12 +98,12 @@ function c(x: string | number) {
 >  : ^^^^^^^^^^^^^^^
 
     x = "";
->x = "" : string
->       : ^^^^^^
+>x = "" : ""
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     do {
         x; // string
diff --git a/tests/baselines/reference/typeGuardsInIfStatement.types b/tests/baselines/reference/typeGuardsInIfStatement.types
index 8ad44e128c0..88910ed2c24 100644
--- a/tests/baselines/reference/typeGuardsInIfStatement.types
+++ b/tests/baselines/reference/typeGuardsInIfStatement.types
@@ -54,12 +54,12 @@ function foo2(x: number | string) {
 >         : ^^^^^^^^
 
         x = 10;
->x = 10 : number
->       : ^^^^^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         return x; // number
 >x : number
@@ -88,12 +88,12 @@ function foo3(x: number | string) {
 >         : ^^^^^^^^
 
         x = "Hello";
->x = "Hello" : string
->            : ^^^^^^
+>x = "Hello" : "Hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"Hello" : string
->        : ^^^^^^
+>"Hello" : "Hello"
+>        : ^^^^^^^
 
         return x; // string
 >x : string
@@ -127,12 +127,12 @@ function foo4(x: number | string) {
     }
     else {
         x = 10;
->x = 10 : number
->       : ^^^^^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         return x; // number
 >x : number
@@ -161,12 +161,12 @@ function foo5(x: number | string) {
     }
     else {
         x = "hello";
->x = "hello" : string
->            : ^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         return x; // string
 >x : string
@@ -190,12 +190,12 @@ function foo6(x: number | string) {
 >         : ^^^^^^^^
 
         x = 10;
->x = 10 : number
->       : ^^^^^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
         return x; // number
 >x : number
@@ -203,12 +203,12 @@ function foo6(x: number | string) {
     }
     else {
         x = "hello";
->x = "hello" : string
->            : ^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
         return x; // string
 >x : string
diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types
index 909f37973ab..7d6e822d465 100644
--- a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types
+++ b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types
@@ -53,14 +53,14 @@ function foo2(x: number | string) {
 >                : ^^^^^^
 >(x = 10) && x : number
 >              : ^^^^^^
->(x = 10) : number
->         : ^^^^^^
->x = 10 : number
->       : ^^^^^^
+>(x = 10) : 10
+>         : ^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >x : number
 >  : ^^^^^^
 }
@@ -86,14 +86,14 @@ function foo3(x: number | string) {
 >                     : ^^^^^^
 >(x = "hello") && x : string
 >                   : ^^^^^^
->(x = "hello") : string
->              : ^^^^^^
->x = "hello" : string
->            : ^^^^^^
+>(x = "hello") : "hello"
+>              : ^^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >x : string
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types
index 2563d52b0fe..6021cf4fbf1 100644
--- a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types
+++ b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types
@@ -54,14 +54,14 @@ function foo2(x: number | string) {
 >                : ^^^^^^
 >(x = 10) || x : number
 >              : ^^^^^^
->(x = 10) : number
->         : ^^^^^^
->x = 10 : number
->       : ^^^^^^
+>(x = 10) : 10
+>         : ^^
+>x = 10 : 10
+>       : ^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >x : number
 >  : ^^^^^^
 }
@@ -87,14 +87,14 @@ function foo3(x: number | string) {
 >                     : ^^^^^^
 >(x = "hello") || x : string
 >                   : ^^^^^^
->(x = "hello") : string
->              : ^^^^^^
->x = "hello" : string
->            : ^^^^^^
+>(x = "hello") : "hello"
+>              : ^^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >x : string
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.types b/tests/baselines/reference/typeGuardsNestedAssignments.types
index f1a7e6a7ffe..069a2e66123 100644
--- a/tests/baselines/reference/typeGuardsNestedAssignments.types
+++ b/tests/baselines/reference/typeGuardsNestedAssignments.types
@@ -181,8 +181,8 @@ while ((match = re.exec("xxx")) != null) {
 >   : ^^^^^^
 >exec : (string: string) => RegExpExecArray | null
 >     : ^      ^^      ^^^^^                      
->"xxx" : string
->      : ^^^^^^
+>"xxx" : "xxx"
+>      : ^^^^^
 
     const length = match[1].length + match[2].length
 >length : number
diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.types b/tests/baselines/reference/typeGuardsOnClassProperty.types
index 176a13b1496..dbdf7dcca52 100644
--- a/tests/baselines/reference/typeGuardsOnClassProperty.types
+++ b/tests/baselines/reference/typeGuardsOnClassProperty.types
@@ -49,8 +49,8 @@ class D {
 >     : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->" " : string
->    : ^^^^^^
+>" " : " "
+>    : ^^^
     }
 
     getData1() {
@@ -90,8 +90,8 @@ class D {
 >     : ^^^^^^^^
 >join : (separator?: string) => string
 >     : ^         ^^^      ^^^^^      
->" " : string
->    : ^^^^^^
+>" " : " "
+>    : ^^^
     }
 }
 
@@ -114,8 +114,8 @@ var o: {
         prop1: "string" ,
 >prop1 : string
 >      : ^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
         prop2: true
 >prop2 : true
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
index ae649b538d8..3cf06c72ade 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
@@ -97,28 +97,28 @@ if (obj3 instanceof B) { // narrowed to B<number>.
 >  : ^^^^^^^^^^^^
 
     obj3.foo = 1;
->obj3.foo = 1 : number
->             : ^^^^^^
+>obj3.foo = 1 : 1
+>             : ^
 >obj3.foo : number
 >         : ^^^^^^
 >obj3 : B<number>
 >     : ^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     obj3.foo = "str";
->obj3.foo = "str" : string
->                 : ^^^^^^
+>obj3.foo = "str" : "str"
+>                 : ^^^^^
 >obj3.foo : number
 >         : ^^^^^^
 >obj3 : B<number>
 >     : ^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
     obj3.bar = "str";
 >obj3.bar = "str" : "str"
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types
index b40cbcc2d0c..f0f867b8e23 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types
@@ -119,28 +119,28 @@ if (obj3 instanceof B) { // narrowed to B<number>.
 >  : ^^^^^^^^^^^^
 
     obj3.foo = 1;
->obj3.foo = 1 : number
->             : ^^^^^^
+>obj3.foo = 1 : 1
+>             : ^
 >obj3.foo : number
 >         : ^^^^^^
 >obj3 : B<number>
 >     : ^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     obj3.foo = "str";
->obj3.foo = "str" : string
->                 : ^^^^^^
+>obj3.foo = "str" : "str"
+>                 : ^^^^^
 >obj3.foo : number
 >         : ^^^^^^
 >obj3 : B<number>
 >     : ^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->"str" : string
->      : ^^^^^^
+>"str" : "str"
+>      : ^^^^^
 
     obj3.bar = "str";
 >obj3.bar = "str" : "str"
diff --git a/tests/baselines/reference/typeInferenceCacheInvalidation.types b/tests/baselines/reference/typeInferenceCacheInvalidation.types
index d11a8bd13e2..0702dd8a16b 100644
--- a/tests/baselines/reference/typeInferenceCacheInvalidation.types
+++ b/tests/baselines/reference/typeInferenceCacheInvalidation.types
@@ -34,8 +34,8 @@ example(42, (foo, bar) => ({
 >                                                                                     : ^   ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >example : <TFoo, TBar, TCallback extends Callback<TFoo, TBar>>(foo: TFoo, callback: TCallback, bar: TBar) => TCallback
 >        : ^    ^^    ^^         ^^^^^^^^^                    ^^   ^^    ^^        ^^         ^^   ^^    ^^^^^         
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >(foo, bar) => ({    t: () => {        let s: string = bar;    }}) : (foo: number, bar: string) => { t: () => void; }
 >                                                                  : ^   ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
@@ -60,16 +60,16 @@ example(42, (foo, bar) => ({
 >    : ^^^^^^
     }
 }), '42');
->'42' : string
->     : ^^^^^^
+>'42' : "42"
+>     : ^^^^
 
 example(42, (foo, bar) => ({
 >example(42, (foo, bar) => ({    t() {        let s: string = bar;    }}), '42') : (foo: number, bar: string) => { t(): void; }
 >                                                                                : ^   ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >example : <TFoo, TBar, TCallback extends Callback<TFoo, TBar>>(foo: TFoo, callback: TCallback, bar: TBar) => TCallback
 >        : ^    ^^    ^^         ^^^^^^^^^                    ^^   ^^    ^^        ^^         ^^   ^^    ^^^^^         
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >(foo, bar) => ({    t() {        let s: string = bar;    }}) : (foo: number, bar: string) => { t(): void; }
 >                                                             : ^   ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
@@ -92,6 +92,6 @@ example(42, (foo, bar) => ({
 >    : ^^^^^^
     }
 }), '42');
->'42' : string
->     : ^^^^^^
+>'42' : "42"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/typeInferenceFBoundedTypeParams.types b/tests/baselines/reference/typeInferenceFBoundedTypeParams.types
index 95d2c61fa74..2864fcc53ac 100644
--- a/tests/baselines/reference/typeInferenceFBoundedTypeParams.types
+++ b/tests/baselines/reference/typeInferenceFBoundedTypeParams.types
@@ -76,12 +76,12 @@ fold(
     [1, 2, 3],
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     [] as [string, string][],
 >[] as [string, string][] : [string, string][]
@@ -108,10 +108,10 @@ fold(
         ["", ""]
 >["", ""] : [string, string]
 >         : ^^^^^^^^^^^^^^^^
->"" : string
->   : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
+>"" : ""
+>   : ^^
 
     )
 );
diff --git a/tests/baselines/reference/typeInferenceFixEarly.types b/tests/baselines/reference/typeInferenceFixEarly.types
index 37049e190a3..97bfffd2259 100644
--- a/tests/baselines/reference/typeInferenceFixEarly.types
+++ b/tests/baselines/reference/typeInferenceFixEarly.types
@@ -18,6 +18,6 @@ f(n => 3);
 >       : ^ ^^^^^^^^^^^^^^^^^^^^
 >n : unknown
 >  : ^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.types b/tests/baselines/reference/typeInferenceLiteralUnion.types
index 63282a5a4d5..bd30c26b082 100644
--- a/tests/baselines/reference/typeInferenceLiteralUnion.types
+++ b/tests/baselines/reference/typeInferenceLiteralUnion.types
@@ -95,8 +95,8 @@ extentMixed = extent([new NumCoercible(10), 13, '12', true]);
 >                     : ^^^^^^^^^^^^
 >NumCoercible : typeof NumCoercible
 >             : ^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >13 : 13
 >   : ^^
 >'12' : "12"
diff --git a/tests/baselines/reference/typeInferenceWithExcessProperties.types b/tests/baselines/reference/typeInferenceWithExcessProperties.types
index 14014b4f736..055932151dd 100644
--- a/tests/baselines/reference/typeInferenceWithExcessProperties.types
+++ b/tests/baselines/reference/typeInferenceWithExcessProperties.types
@@ -32,8 +32,8 @@ parrot({
     name: "TypeScript",
 >name : string
 >     : ^^^^^^
->"TypeScript" : string
->             : ^^^^^^
+>"TypeScript" : "TypeScript"
+>             : ^^^^^^^^^^^^
 
 });
 
@@ -48,14 +48,14 @@ parrot({
     name: "TypeScript",
 >name : string
 >     : ^^^^^^
->"TypeScript" : string
->             : ^^^^^^
+>"TypeScript" : "TypeScript"
+>             : ^^^^^^^^^^^^
 
     age: 5,
 >age : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 });
 
@@ -70,8 +70,8 @@ parrot({
     name: "TypeScript",
 >name : string
 >     : ^^^^^^
->"TypeScript" : string
->             : ^^^^^^
+>"TypeScript" : "TypeScript"
+>             : ^^^^^^^^^^^^
 
     age: function () { },
 >age : () => void
@@ -92,8 +92,8 @@ parrot({
     name: "TypeScript",
 >name : string
 >     : ^^^^^^
->"TypeScript" : string
->             : ^^^^^^
+>"TypeScript" : "TypeScript"
+>             : ^^^^^^^^^^^^
 
     sayHello() {
 >sayHello : () => void
diff --git a/tests/baselines/reference/typeInferenceWithTupleType.types b/tests/baselines/reference/typeInferenceWithTupleType.types
index 15124430e71..7e88b7f79b7 100644
--- a/tests/baselines/reference/typeInferenceWithTupleType.types
+++ b/tests/baselines/reference/typeInferenceWithTupleType.types
@@ -25,10 +25,10 @@ var combineResult = combine("string", 10);
 >                      : ^^^^^^^^^^^^^^^^
 >combine : <T, U>(x: T, y: U) => [T, U]
 >        : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
->"string" : string
->         : ^^^^^^
->10 : number
->   : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
+>10 : 10
+>   : ^^
 
 var combineEle1 = combineResult[0]; // string
 >combineEle1 : string
@@ -152,16 +152,16 @@ var zipResult = zip(["foo", "bar"], [5, 6]);
 >    : ^ ^^ ^^      ^^   ^^      ^^   ^^^^^        
 >["foo", "bar"] : string[]
 >               : ^^^^^^^^
->"foo" : string
->      : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 >[5, 6] : number[]
 >       : ^^^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 var zipResultEle = zipResult[0]; // [string, number]
 >zipResultEle : [string, number]
diff --git a/tests/baselines/reference/typeMatch2.types b/tests/baselines/reference/typeMatch2.types
index 500d8fabfa4..1f435a81d0c 100644
--- a/tests/baselines/reference/typeMatch2.types
+++ b/tests/baselines/reference/typeMatch2.types
@@ -36,8 +36,8 @@ function f1() {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 	a = { x: 1, y: 2, z: 3 };
 >a = { x: 1, y: 2, z: 3 } : { x: number; y: number; z: number; }
@@ -48,12 +48,12 @@ function f1() {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >z : number
 >  : ^^^^^^
 >3 : 3
@@ -68,8 +68,8 @@ function f1() {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >z : number
 >  : ^^^^^^
 >3 : 3
@@ -248,8 +248,8 @@ function f4() {
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : null
 >  : ^^^^
 
@@ -262,8 +262,8 @@ function f4() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
@@ -278,8 +278,8 @@ function f4() {
 >                  : ^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : any
 >  : ^^^
 >_any : any
@@ -294,8 +294,8 @@ function f4() {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : any
 >  : ^^^
 >_any : any
@@ -314,8 +314,8 @@ function f4() {
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     var mf = function m(n) { return false; };
 >mf : (n: any) => boolean
diff --git a/tests/baselines/reference/typeOfThisGeneral.types b/tests/baselines/reference/typeOfThisGeneral.types
index fe495708113..5833d5a1183 100644
--- a/tests/baselines/reference/typeOfThisGeneral.types
+++ b/tests/baselines/reference/typeOfThisGeneral.types
@@ -30,16 +30,16 @@ class MyTestClass {
 >  : ^^^^^^
 
         this.canary = 3;
->this.canary = 3 : number
->                : ^^^^^^
+>this.canary = 3 : 3
+>                : ^
 >this.canary : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >canary : number
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 
     //type of 'this' in member function param list is the class instance type
@@ -296,16 +296,16 @@ class MyGenericTestClass<T, U> {
 >  : ^^^^^^
 
         this.canary = 3;
->this.canary = 3 : number
->                : ^^^^^^
+>this.canary = 3 : 3
+>                : ^
 >this.canary : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >canary : number
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
     }
 
     //type of 'this' in member function param list is the class instance type
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers.types b/tests/baselines/reference/typeOfThisInStaticMembers.types
index 486e0588e45..42c68697995 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers.types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers.types
@@ -76,8 +76,8 @@ var r4 = new t(1);
 >         : ^
 >t : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class C2<T> {
 >C2 : C2<T>
@@ -158,7 +158,7 @@ var r7 = new t2('');
 >           : ^^^^^^^^^^^
 >t2 : typeof C2
 >   : ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es2022).types b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es2022).types
index 6b4fe41750e..7b089e97810 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es2022).types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es2022).types
@@ -14,8 +14,8 @@ class C {
 >                : ^
 >this : typeof C
 >     : ^^^^^^^^
->"yep" : string
->      : ^^^^^^
+>"yep" : "yep"
+>      : ^^^^^
 
     constructor (private foo: string) {
 >foo : string
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).types b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).types
index 6b4fe41750e..7b089e97810 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).types
@@ -14,8 +14,8 @@ class C {
 >                : ^
 >this : typeof C
 >     : ^^^^^^^^
->"yep" : string
->      : ^^^^^^
+>"yep" : "yep"
+>      : ^^^^^
 
     constructor (private foo: string) {
 >foo : string
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es6).types b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es6).types
index 6b4fe41750e..7b089e97810 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es6).types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es6).types
@@ -14,8 +14,8 @@ class C {
 >                : ^
 >this : typeof C
 >     : ^^^^^^^^
->"yep" : string
->      : ^^^^^^
+>"yep" : "yep"
+>      : ^^^^^
 
     constructor (private foo: string) {
 >foo : string
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers5(target=esnext).types b/tests/baselines/reference/typeOfThisInStaticMembers5(target=esnext).types
index 6b4fe41750e..7b089e97810 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers5(target=esnext).types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers5(target=esnext).types
@@ -14,8 +14,8 @@ class C {
 >                : ^
 >this : typeof C
 >     : ^^^^^^^^
->"yep" : string
->      : ^^^^^^
+>"yep" : "yep"
+>      : ^^^^^
 
     constructor (private foo: string) {
 >foo : string
diff --git a/tests/baselines/reference/typeOfYieldWithUnionInContextualReturnType.types b/tests/baselines/reference/typeOfYieldWithUnionInContextualReturnType.types
index 7cc57eb1835..3265b4e3f10 100644
--- a/tests/baselines/reference/typeOfYieldWithUnionInContextualReturnType.types
+++ b/tests/baselines/reference/typeOfYieldWithUnionInContextualReturnType.types
@@ -40,8 +40,8 @@ const syncFactory: SyncSequenceFactory = function* (){
 >     : ^^^^^^
 >yield "What is your name?" : string
 >                           : ^^^^^^
->"What is your name?" : string
->                     : ^^^^^^
+>"What is your name?" : "What is your name?"
+>                     : ^^^^^^^^^^^^^^^^^^^^
   }
   return `That's the end of the game, ${name}`
 >`That's the end of the game, ${name}` : string
@@ -75,8 +75,8 @@ const asyncFactory: AsyncSequenceFactory = async function* (){
 >     : ^^^^^^
 >yield "What is your name?" : string
 >                           : ^^^^^^
->"What is your name?" : string
->                     : ^^^^^^
+>"What is your name?" : "What is your name?"
+>                     : ^^^^^^^^^^^^^^^^^^^^
   }
   return `That's the end of the game, ${name}`
 >`That's the end of the game, ${name}` : string
@@ -110,8 +110,8 @@ const looserSyncFactory: SequenceFactory = function* (){
 >     : ^^^^^^
 >yield "What is your name?" : string
 >                           : ^^^^^^
->"What is your name?" : string
->                     : ^^^^^^
+>"What is your name?" : "What is your name?"
+>                     : ^^^^^^^^^^^^^^^^^^^^
   }
   return `That's the end of the game, ${name}`
 >`That's the end of the game, ${name}` : string
@@ -145,8 +145,8 @@ const looserAsyncFactory: SequenceFactory = async function* (){
 >     : ^^^^^^
 >yield "What is your name?" : string
 >                           : ^^^^^^
->"What is your name?" : string
->                     : ^^^^^^
+>"What is your name?" : "What is your name?"
+>                     : ^^^^^^^^^^^^^^^^^^^^
   }
   return `That's the end of the game, ${name}`
 >`That's the end of the game, ${name}` : string
diff --git a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
index e3a3b9ce274..f41dfbfa4e8 100644
--- a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
+++ b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
@@ -18,8 +18,8 @@ function f<A extends Number>(A: A): A {
 >  : ^
 >toExponential : (fractionDigits?: number) => string
 >              : ^              ^^^      ^^^^^      
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     return null;
 }
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types
index 40c447f5a70..aac7b442ff3 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types
@@ -21,8 +21,8 @@ var r = foo(1, 2);
 >          : ^
 >foo : <T, U extends T>(x: T, y: U) => U
 >    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 
@@ -79,18 +79,18 @@ var r3 = foo({ x: 1 }, { x: 2, y: 3 });
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ x: 2, y: 3 } : { x: number; y: number; }
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >y : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 function foo2<T, U extends { length: T }>(x: T, y: U) { return y; }
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
@@ -109,8 +109,8 @@ foo2(1, '');
 >            : ^^
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
 >     : ^ ^^ ^^^^^^^^^              ^^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -125,34 +125,34 @@ foo2({}, { length: 2 });
 >              : ^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 foo2(1, { width: 3, length: 2 }); 
 >foo2(1, { width: 3, length: 2 }) : { width: number; length: number; }
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
 >     : ^ ^^ ^^^^^^^^^              ^^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ width: 3, length: 2 } : { width: number; length: number; }
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >width : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >length : number
 >       : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 foo2(1, []);
 >foo2(1, []) : any[]
 >            : ^^^^^
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
 >     : ^ ^^ ^^^^^^^^^              ^^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
@@ -161,10 +161,10 @@ foo2(1, ['']);
 >              : ^^^^^^^^
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
 >     : ^ ^^ ^^^^^^^^^              ^^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >[''] : string[]
 >     : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types
index 8b1cba5623f..a8504d38471 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types
@@ -19,18 +19,18 @@ foo(1, '');
 >           : ^^^^^^
 >foo : <T, U extends T>(x: T, y: U) => U
 >    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->'' : string
->   : ^^^^^^
+>1 : 1
+>  : ^
+>'' : ""
+>   : ^^
 
 foo(1, {});
 >foo(1, {}) : number
 >           : ^^^^^^
 >foo : <T, U extends T>(x: T, y: U) => U
 >    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{} : {}
 >   : ^^
 
@@ -50,8 +50,8 @@ var r3 = foo(1, n);
 >          : ^^^^^^
 >foo : <T, U extends T>(x: T, y: U) => U
 >    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >n : NumberVariant
 >  : ^^^^^^^^^^^^^
 
@@ -72,22 +72,22 @@ foo2(1, { length: '' });
 >                        : ^^^^^^^^^^^^^^^^^^^
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
 >     : ^ ^^ ^^^^^^^^^              ^^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ length: '' } : { length: string; }
 >               : ^^^^^^^^^^^^^^^^^^^
 >length : string
 >       : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 foo2(1, { length: {} });
 >foo2(1, { length: {} }) : { length: number; }
 >                        : ^^^^^^^^^^^^^^^^^^^
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
 >     : ^ ^^ ^^^^^^^^^              ^^ ^^ ^^ ^^ ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ length: {} } : { length: {}; }
 >               : ^^^^^^^^^^^^^^^
 >length : {}
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
index 50ebc0d460b..c3a5835dca9 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
@@ -47,10 +47,10 @@ foo(1, 2, 3);
 >             : ^
 >foo : <T, U, V>(x: T, y: U, z: V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >3 : 3
 >  : ^
 
@@ -63,28 +63,28 @@ foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true });
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ x: 1, y: '' } : { x: number; y: string; }
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >{ x: 2, y: '', z: true } : { x: number; y: string; z: true; }
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >z : true
 >  : ^^^^
 >true : true
@@ -115,12 +115,12 @@ foo(a, b, { foo: 1, bar: '', hm: true });
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >bar : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >hm : true
 >   : ^^^^
 >true : true
@@ -192,14 +192,14 @@ foo(b, b, { foo: 1, bar: '', hm: '' });
 >                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >bar : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >hm : string
 >   : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
index ac30e6f31bc..0a88d904a27 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
@@ -47,10 +47,10 @@ foo(1, 2, '');
 >              : ^^
 >foo : <T, U, V>(x: T, y: U, z: V) => V
 >    : ^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >'' : ""
 >   : ^^
 
@@ -63,28 +63,28 @@ foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true });
 >         : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >{ x: 1, y: '' } : { x: number; y: string; }
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : string
 >  : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >{ x: 2, y: 2, z: true } : { x: number; y: number; z: true; }
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >z : true
 >  : ^^^^
 >true : true
@@ -113,12 +113,12 @@ foo(a, { foo: 1, bar: '', hm: true }, b);
 >                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >bar : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 >hm : true
 >   : ^^^^
 >true : true
diff --git a/tests/baselines/reference/typeParameterConstModifiers.types b/tests/baselines/reference/typeParameterConstModifiers.types
index 30d257d8264..6566a49b751 100644
--- a/tests/baselines/reference/typeParameterConstModifiers.types
+++ b/tests/baselines/reference/typeParameterConstModifiers.types
@@ -601,16 +601,16 @@ const test = inners(1,2,3,4,5);
 >                  : ^^^^^^^^^
 >inners : <const T extends readonly any[]>(...args: readonly [unknown, ...T, unknown]) => T
 >       : ^^^^^^^ ^^^^^^^^^              ^^^^^    ^^                                 ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 >3 : 3
 >  : ^
 >4 : 4
 >  : ^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 declare function inners2<const T extends readonly any[]>(args: readonly [unknown, ...T, unknown]): T;
 >inners2 : <const T extends readonly any[]>(args: readonly [unknown, ...T, unknown]) => T
@@ -627,16 +627,16 @@ const test2 = inners2([1,2,3,4,5]);
 >        : ^^^^^^^ ^^^^^^^^^              ^^    ^^                                 ^^^^^ 
 >[1,2,3,4,5] : [number, 2, 3, 4, number]
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >2 : 2
 >  : ^
 >3 : 3
 >  : ^
 >4 : 4
 >  : ^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 // Repro from #53307
 
diff --git a/tests/baselines/reference/typeParameterLeak.types b/tests/baselines/reference/typeParameterLeak.types
index 7f44a75d674..3700dc7d26e 100644
--- a/tests/baselines/reference/typeParameterLeak.types
+++ b/tests/baselines/reference/typeParameterLeak.types
@@ -50,12 +50,12 @@ const b = f({ x: "", y: "" })?.getBox();
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >y : string
 >  : ^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 >getBox : (() => Box<{ y: string; }>) | (() => Box<{ x: string; }>) | undefined
 >       : ^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.types b/tests/baselines/reference/typeParametersAndParametersInComputedNames.types
index aeba773bb79..2dbb4e038ae 100644
--- a/tests/baselines/reference/typeParametersAndParametersInComputedNames.types
+++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.types
@@ -8,8 +8,8 @@ function foo<T>(a: T) : string {
 >  : ^
 
     return "";
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 class A {
diff --git a/tests/baselines/reference/typePredicateWithThisParameter.types b/tests/baselines/reference/typePredicateWithThisParameter.types
index 57526507a6b..171a485208f 100644
--- a/tests/baselines/reference/typePredicateWithThisParameter.types
+++ b/tests/baselines/reference/typePredicateWithThisParameter.types
@@ -59,16 +59,16 @@ if (isFoo1(test)) {
 >     : ^^^^^^^^^
 
     test.foo = 'hi';
->test.foo = 'hi' : string
->                : ^^^^^^
+>test.foo = 'hi' : "hi"
+>                : ^^^^
 >test.foo : string
 >         : ^^^^^^
 >test : Foo
 >     : ^^^
 >foo : string
 >    : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 }
 
 if (isFoo2(test)) {
@@ -80,15 +80,15 @@ if (isFoo2(test)) {
 >     : ^^^^^^^^^
 
     test.foo = 'hi';
->test.foo = 'hi' : string
->                : ^^^^^^
+>test.foo = 'hi' : "hi"
+>                : ^^^^
 >test.foo : string
 >         : ^^^^^^
 >test : Foo
 >     : ^^^
 >foo : string
 >    : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 }
 
diff --git a/tests/baselines/reference/typePredicatesOptionalChaining2.types b/tests/baselines/reference/typePredicatesOptionalChaining2.types
index ad2c68ab0f2..5838a1ccd6a 100644
--- a/tests/baselines/reference/typePredicatesOptionalChaining2.types
+++ b/tests/baselines/reference/typePredicatesOptionalChaining2.types
@@ -36,8 +36,8 @@ const getName1 = (person?: Person): string => {
 >       : ^^^^^^
 >name : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 };
 
@@ -86,8 +86,8 @@ const getName2 = (person?: Person): string => {
 >       : ^^^^^^
 >name : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 };
 
diff --git a/tests/baselines/reference/typeQueryOnClass.types b/tests/baselines/reference/typeQueryOnClass.types
index 3ab68ec17c0..c68816cfb83 100644
--- a/tests/baselines/reference/typeQueryOnClass.types
+++ b/tests/baselines/reference/typeQueryOnClass.types
@@ -80,8 +80,8 @@ class C<T> {
 >baz : (x: any) => string
 >    : ^ ^^^^^^^^^^      
 >x : any
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     ia = 1;
 >ia : number
diff --git a/tests/baselines/reference/typeSatisfaction.types b/tests/baselines/reference/typeSatisfaction.types
index 760c7bf1ae4..bbdfeb5782b 100644
--- a/tests/baselines/reference/typeSatisfaction.types
+++ b/tests/baselines/reference/typeSatisfaction.types
@@ -31,8 +31,8 @@ const t1 = { a: 1 } satisfies I1; // Ok
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const t2 = { a: 1, b: 1 } satisfies I1; // Error
 >t2 : { a: number; b: number; }
@@ -43,8 +43,8 @@ const t2 = { a: 1, b: 1 } satisfies I1; // Error
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >b : number
 >  : ^^^^^^
 >1 : 1
@@ -89,8 +89,8 @@ const t5 = (m => m.substring(0)) satisfies T2; // Ok
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 const t6 = [1, 2] satisfies [number, number];
 >t6 : [number, number]
@@ -99,10 +99,10 @@ const t6 = [1, 2] satisfies [number, number];
 >                                  : ^^^^^^^^^^^^^^^^
 >[1, 2] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 interface A {
     a: string
@@ -118,7 +118,7 @@ let t7 = { a: 'test' } satisfies A;
 >              : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 
 let t8 = { a: 'test', b: 'test' } satisfies A;
@@ -130,7 +130,7 @@ let t8 = { a: 'test', b: 'test' } satisfies A;
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 >b : string
 >  : ^^^^^^
diff --git a/tests/baselines/reference/typeSatisfactionWithDefaultExport.types b/tests/baselines/reference/typeSatisfactionWithDefaultExport.types
index 6378ac4f0f1..cfbea4beb45 100644
--- a/tests/baselines/reference/typeSatisfactionWithDefaultExport.types
+++ b/tests/baselines/reference/typeSatisfactionWithDefaultExport.types
@@ -25,6 +25,6 @@ export default { a: 1 } satisfies Foo;
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/typeSatisfaction_asConstArrays.types b/tests/baselines/reference/typeSatisfaction_asConstArrays.types
index 70c712d5122..36cd3213f87 100644
--- a/tests/baselines/reference/typeSatisfaction_asConstArrays.types
+++ b/tests/baselines/reference/typeSatisfaction_asConstArrays.types
@@ -3,35 +3,35 @@
 === typeSatisfaction_asConstArrays.ts ===
 // with readonly array
 const arr1 = [1, 2, 3] as const satisfies readonly unknown[]
->arr1 : readonly [number, number, number]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[1, 2, 3] as const satisfies readonly unknown[] : readonly [number, number, number]
->                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[1, 2, 3] as const : readonly [number, number, number]
->                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->[1, 2, 3] : readonly [number, number, number]
->          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>arr1 : readonly [1, 2, 3]
+>     : ^^^^^^^^^^^^^^^^^^
+>[1, 2, 3] as const satisfies readonly unknown[] : readonly [1, 2, 3]
+>                                                : ^^^^^^^^^^^^^^^^^^
+>[1, 2, 3] as const : readonly [1, 2, 3]
+>                   : ^^^^^^^^^^^^^^^^^^
+>[1, 2, 3] : readonly [1, 2, 3]
+>          : ^^^^^^^^^^^^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 // with mutable array
 const arr2 = [1, 2, 3] as const satisfies unknown[]
->arr2 : [number, number, number]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^
->[1, 2, 3] as const satisfies unknown[] : [number, number, number]
->                                       : ^^^^^^^^^^^^^^^^^^^^^^^^
->[1, 2, 3] as const : [number, number, number]
->                   : ^^^^^^^^^^^^^^^^^^^^^^^^
->[1, 2, 3] : [number, number, number]
->          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>arr2 : [1, 2, 3]
+>     : ^^^^^^^^^
+>[1, 2, 3] as const satisfies unknown[] : [1, 2, 3]
+>                                       : ^^^^^^^^^
+>[1, 2, 3] as const : [1, 2, 3]
+>                   : ^^^^^^^^^
+>[1, 2, 3] : [1, 2, 3]
+>          : ^^^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/typeSatisfaction_contextualTyping3.types b/tests/baselines/reference/typeSatisfaction_contextualTyping3.types
index 6f1fe860ec4..cc26b6a3b22 100644
--- a/tests/baselines/reference/typeSatisfaction_contextualTyping3.types
+++ b/tests/baselines/reference/typeSatisfaction_contextualTyping3.types
@@ -73,8 +73,8 @@ const fn = ((x = "ok") => null) satisfies StringOrNumberFunc;
 >                   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 
 fn();
 >fn() : null
@@ -87,7 +87,7 @@ fn(32);
 >       : ^^^^
 >fn : (x?: string | number) => null
 >   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->32 : number
->   : ^^^^^^
+>32 : 32
+>   : ^^
 
 
diff --git a/tests/baselines/reference/typeSatisfaction_errorLocations1.errors.txt b/tests/baselines/reference/typeSatisfaction_errorLocations1.errors.txt
index 0921d77cf52..0d31158d642 100644
--- a/tests/baselines/reference/typeSatisfaction_errorLocations1.errors.txt
+++ b/tests/baselines/reference/typeSatisfaction_errorLocations1.errors.txt
@@ -17,7 +17,7 @@ typeSatisfaction_errorLocations1.ts(18,5): error TS2345: Argument of type '[{ a:
 typeSatisfaction_errorLocations1.ts(21,43): error TS2322: Type 'number' is not assignable to type 'boolean'.
 typeSatisfaction_errorLocations1.ts(23,23): error TS2322: Type 'boolean' is not assignable to type 'number'.
 typeSatisfaction_errorLocations1.ts(25,20): error TS1360: Type 'number' does not satisfy the expected type 'boolean'.
-typeSatisfaction_errorLocations1.ts(26,7): error TS2322: Type 'number' is not assignable to type 'true'.
+typeSatisfaction_errorLocations1.ts(26,7): error TS2322: Type '1' is not assignable to type 'true'.
 typeSatisfaction_errorLocations1.ts(29,18): error TS2322: Type 'string' is not assignable to type 'number'.
 typeSatisfaction_errorLocations1.ts(31,20): error TS1360: Type 'readonly [10, "20"]' does not satisfy the expected type 'number[]'.
   The type 'readonly [10, "20"]' is 'readonly' and cannot be assigned to the mutable type 'number[]'.
@@ -95,7 +95,7 @@ typeSatisfaction_errorLocations1.ts(48,21): error TS2322: Type '{ a: number; }'
 !!! error TS1360: Type 'number' does not satisfy the expected type 'boolean'.
     const literal2: true = 1 satisfies number;
           ~~~~~~~~
-!!! error TS2322: Type 'number' is not assignable to type 'true'.
+!!! error TS2322: Type '1' is not assignable to type 'true'.
     
     declare function fn3(...args: unknown[]): void;
     fn3(10, ...([10, "20"] satisfies number[]));
diff --git a/tests/baselines/reference/typeSatisfaction_errorLocations1.types b/tests/baselines/reference/typeSatisfaction_errorLocations1.types
index 29c675202a1..4a9abd2f968 100644
--- a/tests/baselines/reference/typeSatisfaction_errorLocations1.types
+++ b/tests/baselines/reference/typeSatisfaction_errorLocations1.types
@@ -159,10 +159,10 @@ const tuple1: [boolean, boolean] = [true, 100 satisfies unknown];
 >                              : ^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
->100 satisfies unknown : number
->                      : ^^^^^^
->100 : number
->    : ^^^^^^
+>100 satisfies unknown : 100
+>                      : ^^^
+>100 : 100
+>    : ^^^
 
 const obj2 = { a: 10, b: true } satisfies Record<string, number>;
 >obj2 : { a: number; b: boolean; }
@@ -173,8 +173,8 @@ const obj2 = { a: 10, b: true } satisfies Record<string, number>;
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : boolean
 >  : ^^^^^^^
 >true : true
@@ -193,10 +193,10 @@ const literal2: true = 1 satisfies number;
 >         : ^^^^
 >true : true
 >     : ^^^^
->1 satisfies number : number
->                   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 satisfies number : 1
+>                   : ^
+>1 : 1
+>  : ^
 
 declare function fn3(...args: unknown[]): void;
 >fn3 : (...args: unknown[]) => void
@@ -209,8 +209,8 @@ fn3(10, ...([10, "20"] satisfies number[]));
 >                                            : ^^^^
 >fn3 : (...args: unknown[]) => void
 >    : ^^^^    ^^         ^^^^^    
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >...([10, "20"] satisfies number[]) : string | number
 >                                   : ^^^^^^^^^^^^^^^
 >([10, "20"] satisfies number[]) : (string | number)[]
@@ -219,10 +219,10 @@ fn3(10, ...([10, "20"] satisfies number[]));
 >                              : ^^^^^^^^^^^^^^^^^^^
 >[10, "20"] : (string | number)[]
 >           : ^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
->"20" : string
->     : ^^^^^^
+>10 : 10
+>   : ^^
+>"20" : "20"
+>     : ^^^^
 
 const tuple2 = [10, "20"] as const;
 >tuple2 : readonly [10, "20"]
@@ -241,8 +241,8 @@ fn3(10, ...(tuple2 satisfies number[]));
 >                                        : ^^^^
 >fn3 : (...args: unknown[]) => void
 >    : ^^^^    ^^         ^^^^^    
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >...(tuple2 satisfies number[]) : 10 | "20"
 >                               : ^^^^^^^^^
 >(tuple2 satisfies number[]) : readonly [10, "20"]
@@ -263,8 +263,8 @@ fn4(10, ...(["10", "20"] satisfies readonly string[]));
 >                                                       : ^^^^
 >fn4 : (...args: number[]) => void
 >    : ^^^^    ^^        ^^^^^    
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >...(["10", "20"] satisfies readonly string[]) : string
 >                                              : ^^^^^^
 >(["10", "20"] satisfies readonly string[]) : string[]
@@ -273,10 +273,10 @@ fn4(10, ...(["10", "20"] satisfies readonly string[]));
 >                                         : ^^^^^^^^
 >["10", "20"] : string[]
 >             : ^^^^^^^^
->"10" : string
->     : ^^^^^^
->"20" : string
->     : ^^^^^^
+>"10" : "10"
+>     : ^^^^
+>"20" : "20"
+>     : ^^^^
 
 const tuple3 = ["10", "20"] as const;
 >tuple3 : readonly ["10", "20"]
@@ -295,8 +295,8 @@ fn4(10, ...(tuple3 satisfies readonly string[]));
 >                                                 : ^^^^
 >fn4 : (...args: number[]) => void
 >    : ^^^^    ^^        ^^^^^    
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >...(tuple3 satisfies readonly string[]) : "20" | "10"
 >                                        : ^^^^^^^^^^^
 >(tuple3 satisfies readonly string[]) : readonly ["10", "20"]
@@ -311,10 +311,10 @@ function fn5(): number {
 >    : ^^^^^^      
 
   return "foo" satisfies unknown;
->"foo" satisfies unknown : string
->                        : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" satisfies unknown : "foo"
+>                        : ^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 }
 
 function fn6(): number {
@@ -322,10 +322,10 @@ function fn6(): number {
 >    : ^^^^^^      
 
   return "foo" satisfies number;
->"foo" satisfies number : string
->                       : ^^^^^^
->"foo" : string
->      : ^^^^^^
+>"foo" satisfies number : "foo"
+>                       : ^^^^^
+>"foo" : "foo"
+>      : ^^^^^
 }
 
 ((): { a: true } => ({}) satisfies unknown)();
diff --git a/tests/baselines/reference/typeSatisfaction_optionalMemberConformance.types b/tests/baselines/reference/typeSatisfaction_optionalMemberConformance.types
index fd9f77c431b..d1cba381344 100644
--- a/tests/baselines/reference/typeSatisfaction_optionalMemberConformance.types
+++ b/tests/baselines/reference/typeSatisfaction_optionalMemberConformance.types
@@ -19,8 +19,8 @@ const a = { x: 10 } satisfies Partial<Point2d>;
 >          : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 // Should OK
 console.log(a.x.toFixed());
diff --git a/tests/baselines/reference/typeSatisfaction_propNameConstraining.types b/tests/baselines/reference/typeSatisfaction_propNameConstraining.types
index 95cb95548e4..614fdf09868 100644
--- a/tests/baselines/reference/typeSatisfaction_propNameConstraining.types
+++ b/tests/baselines/reference/typeSatisfaction_propNameConstraining.types
@@ -16,14 +16,14 @@ const p = {
     a: 0,
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b: "hello",
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x: 8 // Should error, 'x' isn't in 'Keys'
 >x : number
@@ -65,8 +65,8 @@ let b = p.b.substring(1);
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Should error even though 'd' is in 'Keys'
 let d = p.d;
diff --git a/tests/baselines/reference/typeSatisfaction_propertyNameFulfillment.types b/tests/baselines/reference/typeSatisfaction_propertyNameFulfillment.types
index 124788ff1d3..a6e8c24f1a9 100644
--- a/tests/baselines/reference/typeSatisfaction_propertyNameFulfillment.types
+++ b/tests/baselines/reference/typeSatisfaction_propertyNameFulfillment.types
@@ -16,14 +16,14 @@ const p = {
     a: 0,
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     b: "hello",
 >b : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x: 8 // Should error, 'x' isn't in 'Keys'
 >x : number
@@ -65,8 +65,8 @@ let b = p.b.substring(1);
 >  : ^^^^^^
 >substring : (start: number, end?: number) => string
 >          : ^     ^^      ^^   ^^^      ^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 // Should error even though 'd' is in 'Keys'
 let d = p.d;
diff --git a/tests/baselines/reference/typeSatisfaction_propertyValueConformance3.types b/tests/baselines/reference/typeSatisfaction_propertyValueConformance3.types
index 565c752be08..4b6ea3bdd67 100644
--- a/tests/baselines/reference/typeSatisfaction_propertyValueConformance3.types
+++ b/tests/baselines/reference/typeSatisfaction_propertyValueConformance3.types
@@ -27,16 +27,16 @@ export const Palette = {
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >r : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 >g : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 >b : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 
     black: { r: 0, g: 0, d: 0 }, // <- oops! 'd' in place of 'b'
 >black : { r: number; g: number; d: number; }
@@ -45,12 +45,12 @@ export const Palette = {
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >r : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >g : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >d : number
 >  : ^^^^^^
 >0 : 0
@@ -63,16 +63,16 @@ export const Palette = {
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >r : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >g : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >b : number
 >  : ^^^^^^
->255 : number
->    : ^^^^^^
+>255 : 255
+>    : ^^^
 
 } satisfies Record<string, Color>;
 
diff --git a/tests/baselines/reference/typeTagModuleExports.types b/tests/baselines/reference/typeTagModuleExports.types
index 0af179a9232..87836e9e771 100644
--- a/tests/baselines/reference/typeTagModuleExports.types
+++ b/tests/baselines/reference/typeTagModuleExports.types
@@ -11,6 +11,6 @@ module.exports = 0;
 >       : ^^^^^^^^^^^^^^^^^^^^
 >exports : string
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/typeTagNoErasure.types b/tests/baselines/reference/typeTagNoErasure.types
index 17108c75ed8..896ad656cbd 100644
--- a/tests/baselines/reference/typeTagNoErasure.types
+++ b/tests/baselines/reference/typeTagNoErasure.types
@@ -27,6 +27,6 @@ test('hi') // error, T=number
 >           : ^^^^^^
 >test : Test<number>
 >     : ^^^^^^^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/typeTagPrototypeAssignment.types b/tests/baselines/reference/typeTagPrototypeAssignment.types
index 49d83c1b12d..f8d69d7e930 100644
--- a/tests/baselines/reference/typeTagPrototypeAssignment.types
+++ b/tests/baselines/reference/typeTagPrototypeAssignment.types
@@ -7,14 +7,14 @@ function C() {
 }
 /** @type {string} */
 C.prototype = 12
->C.prototype = 12 : number
->                 : ^^^^^^
+>C.prototype = 12 : 12
+>                 : ^^
 >C.prototype : string
 >            : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
 >prototype : string
 >          : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
diff --git a/tests/baselines/reference/typeVal.types b/tests/baselines/reference/typeVal.types
index acc9d051415..6623fcada9f 100644
--- a/tests/baselines/reference/typeVal.types
+++ b/tests/baselines/reference/typeVal.types
@@ -14,19 +14,19 @@ var I:I = { I: 3};
 >        : ^^^^^^^^^^^^^^
 >I : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 I.I=4;
->I.I=4 : number
->      : ^^^^^^
+>I.I=4 : 4
+>      : ^
 >I.I : number
 >    : ^^^^^^
 >I : I
 >  : ^
 >I : number
 >  : ^^^^^^
->4 : number
->  : ^^^^^^
+>4 : 4
+>  : ^
 
 
diff --git a/tests/baselines/reference/typedArrays-es5.types b/tests/baselines/reference/typedArrays-es5.types
index 6ac3392d89e..77ba207237e 100644
--- a/tests/baselines/reference/typedArrays-es5.types
+++ b/tests/baselines/reference/typedArrays-es5.types
@@ -8,8 +8,8 @@ const float32Array = new Float32Array(1);
 >                    : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...float32Array];
 >[...float32Array] : any[]
@@ -26,8 +26,8 @@ const float64Array = new Float64Array(1);
 >                    : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...float64Array];
 >[...float64Array] : any[]
@@ -44,8 +44,8 @@ const int16Array = new Int16Array(1);
 >                  : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...int16Array];
 >[...int16Array] : any[]
@@ -62,8 +62,8 @@ const int32Array = new Int32Array(1);
 >                  : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...int32Array];
 >[...int32Array] : any[]
@@ -80,8 +80,8 @@ const int8Array = new Int8Array(1);
 >                 : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...int8Array];
 >[...int8Array] : any[]
@@ -114,8 +114,8 @@ const uint16Array = new Uint16Array(1);
 >                   : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint16Array];
 >[...uint16Array] : any[]
@@ -132,8 +132,8 @@ const uint32Array = new Uint32Array(1);
 >                   : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint32Array];
 >[...uint32Array] : any[]
@@ -150,8 +150,8 @@ const uint8Array = new Uint8Array(1);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint8Array];
 >[...uint8Array] : any[]
@@ -168,8 +168,8 @@ const uint8ClampedArray = new Uint8ClampedArray(1);
 >                         : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint8ClampedArray];
 >[...uint8ClampedArray] : any[]
diff --git a/tests/baselines/reference/typedArrays-es6.types b/tests/baselines/reference/typedArrays-es6.types
index 20dde53e841..42ff5a80f01 100644
--- a/tests/baselines/reference/typedArrays-es6.types
+++ b/tests/baselines/reference/typedArrays-es6.types
@@ -8,8 +8,8 @@ const float32Array = new Float32Array(1);
 >                    : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...float32Array];
 >[...float32Array] : number[]
@@ -26,8 +26,8 @@ const float64Array = new Float64Array(1);
 >                    : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...float64Array];
 >[...float64Array] : number[]
@@ -44,8 +44,8 @@ const int16Array = new Int16Array(1);
 >                  : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...int16Array];
 >[...int16Array] : number[]
@@ -62,8 +62,8 @@ const int32Array = new Int32Array(1);
 >                  : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...int32Array];
 >[...int32Array] : number[]
@@ -80,8 +80,8 @@ const int8Array = new Int8Array(1);
 >                 : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...int8Array];
 >[...int8Array] : number[]
@@ -114,8 +114,8 @@ const uint16Array = new Uint16Array(1);
 >                   : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint16Array];
 >[...uint16Array] : number[]
@@ -132,8 +132,8 @@ const uint32Array = new Uint32Array(1);
 >                   : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint32Array];
 >[...uint32Array] : number[]
@@ -150,8 +150,8 @@ const uint8Array = new Uint8Array(1);
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint8Array];
 >[...uint8Array] : number[]
@@ -168,8 +168,8 @@ const uint8ClampedArray = new Uint8ClampedArray(1);
 >                         : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 [...uint8ClampedArray];
 >[...uint8ClampedArray] : number[]
diff --git a/tests/baselines/reference/typedArrays.types b/tests/baselines/reference/typedArrays.types
index cc0cc73923d..b6f692914ad 100644
--- a/tests/baselines/reference/typedArrays.types
+++ b/tests/baselines/reference/typedArrays.types
@@ -1008,14 +1008,14 @@ function CreateTypedArraysOf2() {
 >          : ^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Int8Array
 >   : ^^^^     ^^        ^^^^^         
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[1] = Uint8Array.of(1,2,3,4);
 >typedArrays[1] = Uint8Array.of(1,2,3,4) : Uint8Array
@@ -1033,14 +1033,14 @@ function CreateTypedArraysOf2() {
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Uint8Array
 >   : ^^^^     ^^        ^^^^^          
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[2] = Int16Array.of(1,2,3,4);
 >typedArrays[2] = Int16Array.of(1,2,3,4) : Int16Array
@@ -1058,14 +1058,14 @@ function CreateTypedArraysOf2() {
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Int16Array
 >   : ^^^^     ^^        ^^^^^          
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[3] = Uint16Array.of(1,2,3,4);
 >typedArrays[3] = Uint16Array.of(1,2,3,4) : Uint16Array
@@ -1083,14 +1083,14 @@ function CreateTypedArraysOf2() {
 >            : ^^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Uint16Array
 >   : ^^^^     ^^        ^^^^^           
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[4] = Int32Array.of(1,2,3,4);
 >typedArrays[4] = Int32Array.of(1,2,3,4) : Int32Array
@@ -1108,14 +1108,14 @@ function CreateTypedArraysOf2() {
 >           : ^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Int32Array
 >   : ^^^^     ^^        ^^^^^          
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[5] = Uint32Array.of(1,2,3,4);
 >typedArrays[5] = Uint32Array.of(1,2,3,4) : Uint32Array
@@ -1133,14 +1133,14 @@ function CreateTypedArraysOf2() {
 >            : ^^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Uint32Array
 >   : ^^^^     ^^        ^^^^^           
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[6] = Float32Array.of(1,2,3,4);
 >typedArrays[6] = Float32Array.of(1,2,3,4) : Float32Array
@@ -1158,14 +1158,14 @@ function CreateTypedArraysOf2() {
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Float32Array
 >   : ^^^^     ^^        ^^^^^            
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[7] = Float64Array.of(1,2,3,4);
 >typedArrays[7] = Float64Array.of(1,2,3,4) : Float64Array
@@ -1183,14 +1183,14 @@ function CreateTypedArraysOf2() {
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Float64Array
 >   : ^^^^     ^^        ^^^^^            
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     typedArrays[8] = Uint8ClampedArray.of(1,2,3,4);
 >typedArrays[8] = Uint8ClampedArray.of(1,2,3,4) : Uint8ClampedArray
@@ -1208,14 +1208,14 @@ function CreateTypedArraysOf2() {
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >of : (...items: number[]) => Uint8ClampedArray
 >   : ^^^^     ^^        ^^^^^                 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
 
     return typedArrays;
 >typedArrays : any[]
diff --git a/tests/baselines/reference/typedArraysCrossAssignability01.types b/tests/baselines/reference/typedArraysCrossAssignability01.types
index ef8d167c28d..dd42dd79015 100644
--- a/tests/baselines/reference/typedArraysCrossAssignability01.types
+++ b/tests/baselines/reference/typedArraysCrossAssignability01.types
@@ -12,8 +12,8 @@ function CheckAssignability() {
 >                 : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Uint8Array          = new Uint8Array(1);
 >arr_Uint8Array : Uint8Array
@@ -22,8 +22,8 @@ function CheckAssignability() {
 >                  : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Int16Array          = new Int16Array(1);
 >arr_Int16Array : Int16Array
@@ -32,8 +32,8 @@ function CheckAssignability() {
 >                  : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Uint16Array         = new Uint16Array(1);
 >arr_Uint16Array : Uint16Array
@@ -42,8 +42,8 @@ function CheckAssignability() {
 >                   : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Int32Array          = new Int32Array(1);
 >arr_Int32Array : Int32Array
@@ -52,8 +52,8 @@ function CheckAssignability() {
 >                  : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Uint32Array         = new Uint32Array(1);
 >arr_Uint32Array : Uint32Array
@@ -62,8 +62,8 @@ function CheckAssignability() {
 >                   : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Float32Array        = new Float32Array(1);
 >arr_Float32Array : Float32Array
@@ -72,8 +72,8 @@ function CheckAssignability() {
 >                    : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Float64Array        = new Float64Array(1);
 >arr_Float64Array : Float64Array
@@ -82,8 +82,8 @@ function CheckAssignability() {
 >                    : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     let arr_Uint8ClampedArray   = new Uint8ClampedArray(1);
 >arr_Uint8ClampedArray : Uint8ClampedArray
@@ -92,8 +92,8 @@ function CheckAssignability() {
 >                         : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
     arr_Int8Array = arr_Int8Array;
 >arr_Int8Array = arr_Int8Array : Int8Array
diff --git a/tests/baselines/reference/typedArraysSubarray.types b/tests/baselines/reference/typedArraysSubarray.types
index 09500e003b4..b89b96c9d16 100644
--- a/tests/baselines/reference/typedArraysSubarray.types
+++ b/tests/baselines/reference/typedArraysSubarray.types
@@ -12,8 +12,8 @@ function int8ArraySubarray() {
 >                  : ^^^^^^^^^
 >Int8Array : Int8ArrayConstructor
 >          : ^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Int8Array
@@ -34,8 +34,8 @@ function int8ArraySubarray() {
 >    : ^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Int8Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^         
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Int8Array
@@ -46,10 +46,10 @@ function int8ArraySubarray() {
 >    : ^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Int8Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^         
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function uint8ArraySubarray() {
@@ -63,8 +63,8 @@ function uint8ArraySubarray() {
 >                   : ^^^^^^^^^^
 >Uint8Array : Uint8ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Uint8Array
@@ -85,8 +85,8 @@ function uint8ArraySubarray() {
 >    : ^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint8Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^          
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Uint8Array
@@ -97,10 +97,10 @@ function uint8ArraySubarray() {
 >    : ^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint8Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^          
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function uint8ClampedArraySubarray() {
@@ -114,8 +114,8 @@ function uint8ClampedArraySubarray() {
 >                          : ^^^^^^^^^^^^^^^^^
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Uint8ClampedArray
@@ -136,8 +136,8 @@ function uint8ClampedArraySubarray() {
 >    : ^^^^^^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint8ClampedArray
 >         : ^     ^^^      ^^   ^^^      ^^^^^                 
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Uint8ClampedArray
@@ -148,10 +148,10 @@ function uint8ClampedArraySubarray() {
 >    : ^^^^^^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint8ClampedArray
 >         : ^     ^^^      ^^   ^^^      ^^^^^                 
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function int16ArraySubarray() {
@@ -165,8 +165,8 @@ function int16ArraySubarray() {
 >                   : ^^^^^^^^^^
 >Int16Array : Int16ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Int16Array
@@ -187,8 +187,8 @@ function int16ArraySubarray() {
 >    : ^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Int16Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^          
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Int16Array
@@ -199,10 +199,10 @@ function int16ArraySubarray() {
 >    : ^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Int16Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^          
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function uint16ArraySubarray() {
@@ -216,8 +216,8 @@ function uint16ArraySubarray() {
 >                    : ^^^^^^^^^^^
 >Uint16Array : Uint16ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Uint16Array
@@ -238,8 +238,8 @@ function uint16ArraySubarray() {
 >    : ^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint16Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^           
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Uint16Array
@@ -250,10 +250,10 @@ function uint16ArraySubarray() {
 >    : ^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint16Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^           
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function int32ArraySubarray() {
@@ -267,8 +267,8 @@ function int32ArraySubarray() {
 >                   : ^^^^^^^^^^
 >Int32Array : Int32ArrayConstructor
 >           : ^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Int32Array
@@ -289,8 +289,8 @@ function int32ArraySubarray() {
 >    : ^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Int32Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^          
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Int32Array
@@ -301,10 +301,10 @@ function int32ArraySubarray() {
 >    : ^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Int32Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^          
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function uint32ArraySubarray() {
@@ -318,8 +318,8 @@ function uint32ArraySubarray() {
 >                    : ^^^^^^^^^^^
 >Uint32Array : Uint32ArrayConstructor
 >            : ^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Uint32Array
@@ -340,8 +340,8 @@ function uint32ArraySubarray() {
 >    : ^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint32Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^           
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Uint32Array
@@ -352,10 +352,10 @@ function uint32ArraySubarray() {
 >    : ^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Uint32Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^           
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function float32ArraySubarray() {
@@ -369,8 +369,8 @@ function float32ArraySubarray() {
 >                     : ^^^^^^^^^^^^
 >Float32Array : Float32ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Float32Array
@@ -391,8 +391,8 @@ function float32ArraySubarray() {
 >    : ^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Float32Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^            
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Float32Array
@@ -403,10 +403,10 @@ function float32ArraySubarray() {
 >    : ^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Float32Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^            
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
 function float64ArraySubarray() {
@@ -420,8 +420,8 @@ function float64ArraySubarray() {
 >                     : ^^^^^^^^^^^^
 >Float64Array : Float64ArrayConstructor
 >             : ^^^^^^^^^^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
     arr.subarray();
 >arr.subarray() : Float64Array
@@ -442,8 +442,8 @@ function float64ArraySubarray() {
 >    : ^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Float64Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^            
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
     arr.subarray(0, 10);
 >arr.subarray(0, 10) : Float64Array
@@ -454,9 +454,9 @@ function float64ArraySubarray() {
 >    : ^^^^^^^^^^^^
 >subarray : (begin?: number, end?: number) => Float64Array
 >         : ^     ^^^      ^^   ^^^      ^^^^^            
->0 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>0 : 0
+>  : ^
+>10 : 10
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/typedefOnSemicolonClassElement.types b/tests/baselines/reference/typedefOnSemicolonClassElement.types
index c21d8d35cdf..74218de7661 100644
--- a/tests/baselines/reference/typedefOnSemicolonClassElement.types
+++ b/tests/baselines/reference/typedefOnSemicolonClassElement.types
@@ -11,7 +11,7 @@ export class Preferences {
   a = 'ok'
 >a : string
 >  : ^^^^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 }
 
diff --git a/tests/baselines/reference/typedefOnStatements.types b/tests/baselines/reference/typedefOnStatements.types
index 9158b14ebf7..fff1989136f 100644
--- a/tests/baselines/reference/typedefOnStatements.types
+++ b/tests/baselines/reference/typedefOnStatements.types
@@ -81,8 +81,8 @@ throw new Error('Unreachable')
 >                         : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Unreachable' : string
->              : ^^^^^^
+>'Unreachable' : "Unreachable"
+>              : ^^^^^^^^^^^^^
 
 /** @typedef {{ q: string }} Q */
 try {
@@ -269,8 +269,8 @@ function proof (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q) {
 >                   : ^^^^^^^^^^^^^^^^^^
 >alpha : string
 >      : ^^^^^^
->"aleph" : string
->        : ^^^^^^
+>"aleph" : "aleph"
+>        : ^^^^^^^
 
     /** @typedef {{ alpha: string }} Alpha */
     return
diff --git a/tests/baselines/reference/typedefScope1.types b/tests/baselines/reference/typedefScope1.types
index d58e663ddbd..0b41ab64ae6 100644
--- a/tests/baselines/reference/typedefScope1.types
+++ b/tests/baselines/reference/typedefScope1.types
@@ -10,8 +10,8 @@ function B1() {
     var ok1 = 0;
 >ok1 : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function B2() {
@@ -23,8 +23,8 @@ function B2() {
     var ok2 = 'hi';
 >ok2 : string
 >    : ^^^^^^
->'hi' : string
->     : ^^^^^^
+>'hi' : "hi"
+>     : ^^^^
 }
 
 /** @type {B} */
diff --git a/tests/baselines/reference/typedefTagExtraneousProperty.types b/tests/baselines/reference/typedefTagExtraneousProperty.types
index c0e0ab12734..7186d933463 100644
--- a/tests/baselines/reference/typedefTagExtraneousProperty.types
+++ b/tests/baselines/reference/typedefTagExtraneousProperty.types
@@ -13,34 +13,34 @@ var y = { bye: "no" };
 >              : ^^^^^^^^^^^^^^^^
 >bye : string
 >    : ^^^^^^
->"no" : string
->     : ^^^^^^
+>"no" : "no"
+>     : ^^^^
 
 y
 >y : { [x: string]: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^
 
 y.ignoreMe = "ok but just because of the index signature"
->y.ignoreMe = "ok but just because of the index signature" : string
->                                                          : ^^^^^^
+>y.ignoreMe = "ok but just because of the index signature" : "ok but just because of the index signature"
+>                                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >y.ignoreMe : string
 >           : ^^^^^^
 >y : { [x: string]: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^
 >ignoreMe : string
 >         : ^^^^^^
->"ok but just because of the index signature" : string
->                                             : ^^^^^^
+>"ok but just because of the index signature" : "ok but just because of the index signature"
+>                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 y['hi'] = "yes"
->y['hi'] = "yes" : string
->                : ^^^^^^
+>y['hi'] = "yes" : "yes"
+>                : ^^^^^
 >y['hi'] : string
 >        : ^^^^^^
 >y : { [x: string]: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^
 >'hi' : "hi"
 >     : ^^^^
->"yes" : string
->      : ^^^^^^
+>"yes" : "yes"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/typedefTagNested.types b/tests/baselines/reference/typedefTagNested.types
index 532539c8eea..477decf0670 100644
--- a/tests/baselines/reference/typedefTagNested.types
+++ b/tests/baselines/reference/typedefTagNested.types
@@ -20,7 +20,7 @@ const app = {
     name: 'name',
 >name : string
 >     : ^^^^^^
->'name' : string
+>'name' : "name"
 >       : ^^^^^^
 
     icons: {
@@ -32,14 +32,14 @@ const app = {
         image32: 'x.png',
 >image32 : string
 >        : ^^^^^^
->'x.png' : string
->        : ^^^^^^
+>'x.png' : "x.png"
+>        : ^^^^^^^
 
         image64: 'y.png',
 >image64 : string
 >        : ^^^^^^
->'y.png' : string
->        : ^^^^^^
+>'y.png' : "y.png"
+>        : ^^^^^^^
     }
 }
 
@@ -74,16 +74,16 @@ var sala = { name: 'uppsala', not: 0, nested: "ok" };
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->'uppsala' : string
->          : ^^^^^^
+>'uppsala' : "uppsala"
+>          : ^^^^^^^^^
 >not : number
 >    : ^^^^^^
 >0 : 0
 >  : ^
 >nested : string
 >       : ^^^^^^
->"ok" : string
->     : ^^^^^^
+>"ok" : "ok"
+>     : ^^^^
 
 sala.name
 >sala.name : string
diff --git a/tests/baselines/reference/typeofInterface.types b/tests/baselines/reference/typeofInterface.types
index e2e5b3b1294..0e9b2467cb0 100644
--- a/tests/baselines/reference/typeofInterface.types
+++ b/tests/baselines/reference/typeofInterface.types
@@ -36,6 +36,6 @@ var j: typeof k.foo = { a: "hello" };
 >               : ^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/typeofObjectInference.types b/tests/baselines/reference/typeofObjectInference.types
index a20d2af2792..084a5b89bef 100644
--- a/tests/baselines/reference/typeofObjectInference.types
+++ b/tests/baselines/reference/typeofObjectInference.types
@@ -44,8 +44,8 @@ let a = decorateA(({value}) => 5)
 >               : ^         ^^^^^^^^^^^          ^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 function decorateB<O extends any>(fn: (first: typeof val) => O) {
 >decorateB : <O extends unknown>(fn: (first: typeof val) => O) => () => O
@@ -78,8 +78,8 @@ let b = decorateB((value) => 5)
 >             : ^     ^^^^^^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 function decorateC<O extends any>(fn: (first: {value: number}) => O) {
 >decorateC : <O extends unknown>(fn: (first: { value: number; }) => O) => () => O
@@ -116,8 +116,8 @@ let c = decorateC(({value}) => 5)
 >               : ^         ^^^^^^^^^^^      ^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 type First = {value: typeof val}
 >First : First
@@ -160,6 +160,6 @@ let d = decorateD(({value}) => 5)
 >               : ^         ^^^^^^^^^^^^^^^^^^
 >value : number
 >      : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types
index 7b432080f05..a519d58e0ac 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.types
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
index 4f22add0982..c40a3499d25 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ b/tests/baselines/reference/typeofOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -203,8 +203,8 @@ var ResultIsString12 = typeof STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // multiple typeof  operators
 var ResultIsString13 = typeof typeof STRING;
diff --git a/tests/baselines/reference/typeofThis.types b/tests/baselines/reference/typeofThis.types
index 4a75a13cc24..5087396249b 100644
--- a/tests/baselines/reference/typeofThis.types
+++ b/tests/baselines/reference/typeofThis.types
@@ -62,8 +62,8 @@ class Test1 {
 >            : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         var foo: typeof this.data.foo = '';
 >foo : string
@@ -78,8 +78,8 @@ class Test1 {
 >     : ^^^^^^^^^^^^^^^^
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
         var self: typeof this = this;
 >self : this
@@ -106,8 +106,8 @@ class Test1 {
 >     : ^^^^
 >this : string
 >     : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
     }
 }
 
@@ -146,8 +146,8 @@ function Test3(this: { no: number }) {
 >     : ^^^^^^      ^^^
 >no : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 function Test4(this: { no: number } | undefined) {
@@ -167,8 +167,8 @@ function Test4(this: { no: number } | undefined) {
 >     : ^^^^^^      ^^^^^^^^^^^^^^^
 >no : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 class Test5 {
@@ -197,8 +197,8 @@ class Test5 {
 >     : ^^^^
 >no : number
 >   : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
     }
 }
 
diff --git a/tests/baselines/reference/typeofThisInMethodSignature.types b/tests/baselines/reference/typeofThisInMethodSignature.types
index 045a5573faf..811d58c5be7 100644
--- a/tests/baselines/reference/typeofThisInMethodSignature.types
+++ b/tests/baselines/reference/typeofThisInMethodSignature.types
@@ -39,6 +39,6 @@ const a = new A().a(1);
 >  : ^^^^^^^^
 >a : (x: typeof this.x) => void
 >  : ^ ^^             ^^^^^    
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.1.types b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
index c58b577fe19..2a9d1eb54db 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.1.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
@@ -35,8 +35,8 @@ async function * inferReturnType4() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * inferReturnType5() {
 >inferReturnType5 : () => AsyncGenerator<number, void, unknown>
@@ -57,8 +57,8 @@ async function * inferReturnType5() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 }
 async function * inferReturnType6() {
 >inferReturnType6 : () => AsyncGenerator<number, void, undefined>
@@ -89,8 +89,8 @@ async function * inferReturnType7() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * inferReturnType8() {
 >inferReturnType8 : () => AsyncGenerator<number, void, unknown>
@@ -118,8 +118,8 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability2: () => AsyncIterableIterator<number> = async function * () {
@@ -139,8 +139,8 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability3: () => AsyncIterableIterator<number> = async function * () {
@@ -153,10 +153,10 @@ const assignability3: () => AsyncIterableIterator<number> = async function * ()
 >yield* [1, 2] : any
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 };
 const assignability4: () => AsyncIterableIterator<number> = async function * () {
@@ -177,8 +177,8 @@ const assignability4: () => AsyncIterableIterator<number> = async function * ()
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability5: () => AsyncIterableIterator<number> = async function * () {
@@ -198,8 +198,8 @@ const assignability5: () => AsyncIterableIterator<number> = async function * ()
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability6: () => AsyncIterable<number> = async function * () {
@@ -211,8 +211,8 @@ const assignability6: () => AsyncIterable<number> = async function * () {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability7: () => AsyncIterable<number> = async function * () {
@@ -232,8 +232,8 @@ const assignability7: () => AsyncIterable<number> = async function * () {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability8: () => AsyncIterable<number> = async function * () {
@@ -246,10 +246,10 @@ const assignability8: () => AsyncIterable<number> = async function * () {
 >yield* [1, 2] : any
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 };
 const assignability9: () => AsyncIterable<number> = async function * () {
@@ -270,8 +270,8 @@ const assignability9: () => AsyncIterable<number> = async function * () {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability10: () => AsyncIterable<number> = async function * () {
@@ -291,8 +291,8 @@ const assignability10: () => AsyncIterable<number> = async function * () {
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability11: () => AsyncIterator<number> = async function * () {
@@ -304,8 +304,8 @@ const assignability11: () => AsyncIterator<number> = async function * () {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability12: () => AsyncIterator<number> = async function * () {
@@ -325,8 +325,8 @@ const assignability12: () => AsyncIterator<number> = async function * () {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability13: () => AsyncIterator<number> = async function * () {
@@ -339,10 +339,10 @@ const assignability13: () => AsyncIterator<number> = async function * () {
 >yield* [1, 2] : any
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 };
 const assignability14: () => AsyncIterator<number> = async function * () {
@@ -363,8 +363,8 @@ const assignability14: () => AsyncIterator<number> = async function * () {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 const assignability15: () => AsyncIterator<number> = async function * () {
@@ -384,8 +384,8 @@ const assignability15: () => AsyncIterator<number> = async function * () {
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 };
 async function * explicitReturnType1(): AsyncIterableIterator<number> {
@@ -395,8 +395,8 @@ async function * explicitReturnType1(): AsyncIterableIterator<number> {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType2(): AsyncIterableIterator<number> {
 >explicitReturnType2 : () => AsyncIterableIterator<number>
@@ -413,8 +413,8 @@ async function * explicitReturnType2(): AsyncIterableIterator<number> {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType3(): AsyncIterableIterator<number> {
 >explicitReturnType3 : () => AsyncIterableIterator<number>
@@ -424,10 +424,10 @@ async function * explicitReturnType3(): AsyncIterableIterator<number> {
 >yield* [1, 2] : any
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 }
 async function * explicitReturnType4(): AsyncIterableIterator<number> {
 >explicitReturnType4 : () => AsyncIterableIterator<number>
@@ -445,8 +445,8 @@ async function * explicitReturnType4(): AsyncIterableIterator<number> {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType5(): AsyncIterableIterator<number> {
 >explicitReturnType5 : () => AsyncIterableIterator<number>
@@ -463,8 +463,8 @@ async function * explicitReturnType5(): AsyncIterableIterator<number> {
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType6(): AsyncIterable<number> {
 >explicitReturnType6 : () => AsyncIterable<number>
@@ -473,8 +473,8 @@ async function * explicitReturnType6(): AsyncIterable<number> {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType7(): AsyncIterable<number> {
 >explicitReturnType7 : () => AsyncIterable<number>
@@ -491,8 +491,8 @@ async function * explicitReturnType7(): AsyncIterable<number> {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType8(): AsyncIterable<number> {
 >explicitReturnType8 : () => AsyncIterable<number>
@@ -502,10 +502,10 @@ async function * explicitReturnType8(): AsyncIterable<number> {
 >yield* [1, 2] : any
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 }
 async function * explicitReturnType9(): AsyncIterable<number> {
 >explicitReturnType9 : () => AsyncIterable<number>
@@ -523,8 +523,8 @@ async function * explicitReturnType9(): AsyncIterable<number> {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType10(): AsyncIterable<number> {
 >explicitReturnType10 : () => AsyncIterable<number>
@@ -541,8 +541,8 @@ async function * explicitReturnType10(): AsyncIterable<number> {
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType11(): AsyncIterator<number> {
 >explicitReturnType11 : () => AsyncIterator<number>
@@ -551,8 +551,8 @@ async function * explicitReturnType11(): AsyncIterator<number> {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType12(): AsyncIterator<number> {
 >explicitReturnType12 : () => AsyncIterator<number>
@@ -569,8 +569,8 @@ async function * explicitReturnType12(): AsyncIterator<number> {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType13(): AsyncIterator<number> {
 >explicitReturnType13 : () => AsyncIterator<number>
@@ -580,10 +580,10 @@ async function * explicitReturnType13(): AsyncIterator<number> {
 >yield* [1, 2] : any
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 }
 async function * explicitReturnType14(): AsyncIterator<number> {
 >explicitReturnType14 : () => AsyncIterator<number>
@@ -601,8 +601,8 @@ async function * explicitReturnType14(): AsyncIterator<number> {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType15(): AsyncIterator<number> {
 >explicitReturnType15 : () => AsyncIterator<number>
@@ -619,8 +619,8 @@ async function * explicitReturnType15(): AsyncIterator<number> {
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType16(): {} {
 >explicitReturnType16 : () => {}
@@ -660,8 +660,8 @@ async function * awaitedType2() {
 >        : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * nextType1(): { next(...args: [] | [number | PromiseLike<number>]): any } {
 >nextType1 : () => { next(...args: [] | [number | PromiseLike<number>]): any; }
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.2.types b/tests/baselines/reference/types.asyncGenerators.es2018.2.types
index 44bf5984c2b..41275777ea6 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.2.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.2.types
@@ -40,10 +40,10 @@ async function * inferReturnType3() {
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 }
 const assignability1: () => AsyncIterableIterator<number> = async function * () {
 >assignability1 : () => AsyncIterableIterator<number>
@@ -54,8 +54,8 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
     yield "a";
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 const assignability2: () => AsyncIterableIterator<number> = async function * () {
@@ -69,10 +69,10 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()
 >                  : ^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 };
 const assignability3: () => AsyncIterableIterator<number> = async function * () {
@@ -92,8 +92,8 @@ const assignability3: () => AsyncIterableIterator<number> = async function * ()
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 const assignability4: () => AsyncIterable<number> = async function * () {
@@ -105,8 +105,8 @@ const assignability4: () => AsyncIterable<number> = async function * () {
     yield "a";
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 const assignability5: () => AsyncIterable<number> = async function * () {
@@ -120,10 +120,10 @@ const assignability5: () => AsyncIterable<number> = async function * () {
 >                  : ^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 };
 const assignability6: () => AsyncIterable<number> = async function * () {
@@ -143,8 +143,8 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 const assignability7: () => AsyncIterator<number> = async function * () {
@@ -156,8 +156,8 @@ const assignability7: () => AsyncIterator<number> = async function * () {
     yield "a";
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 const assignability8: () => AsyncIterator<number> = async function * () {
@@ -171,10 +171,10 @@ const assignability8: () => AsyncIterator<number> = async function * () {
 >                  : ^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 };
 const assignability9: () => AsyncIterator<number> = async function * () {
@@ -194,8 +194,8 @@ const assignability9: () => AsyncIterator<number> = async function * () {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 };
 async function * explicitReturnType1(): AsyncIterableIterator<number> {
@@ -205,8 +205,8 @@ async function * explicitReturnType1(): AsyncIterableIterator<number> {
     yield "a";
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 async function * explicitReturnType2(): AsyncIterableIterator<number> {
 >explicitReturnType2 : () => AsyncIterableIterator<number>
@@ -217,10 +217,10 @@ async function * explicitReturnType2(): AsyncIterableIterator<number> {
 >                  : ^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 }
 async function * explicitReturnType3(): AsyncIterableIterator<number> {
 >explicitReturnType3 : () => AsyncIterableIterator<number>
@@ -237,8 +237,8 @@ async function * explicitReturnType3(): AsyncIterableIterator<number> {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 async function * explicitReturnType4(): AsyncIterable<number> {
 >explicitReturnType4 : () => AsyncIterable<number>
@@ -247,8 +247,8 @@ async function * explicitReturnType4(): AsyncIterable<number> {
     yield "a";
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 async function * explicitReturnType5(): AsyncIterable<number> {
 >explicitReturnType5 : () => AsyncIterable<number>
@@ -259,10 +259,10 @@ async function * explicitReturnType5(): AsyncIterable<number> {
 >                  : ^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 }
 async function * explicitReturnType6(): AsyncIterable<number> {
 >explicitReturnType6 : () => AsyncIterable<number>
@@ -279,8 +279,8 @@ async function * explicitReturnType6(): AsyncIterable<number> {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 async function * explicitReturnType7(): AsyncIterator<number> {
 >explicitReturnType7 : () => AsyncIterator<number>
@@ -289,8 +289,8 @@ async function * explicitReturnType7(): AsyncIterator<number> {
     yield "a";
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 async function * explicitReturnType8(): AsyncIterator<number> {
 >explicitReturnType8 : () => AsyncIterator<number>
@@ -301,10 +301,10 @@ async function * explicitReturnType8(): AsyncIterator<number> {
 >                  : ^^^
 >["a", "b"] : string[]
 >           : ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 }
 async function * explicitReturnType9(): AsyncIterator<number> {
 >explicitReturnType9 : () => AsyncIterator<number>
@@ -321,8 +321,8 @@ async function * explicitReturnType9(): AsyncIterator<number> {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >yield "a" : undefined
 >          : ^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 }
 async function * explicitReturnType10(): IterableIterator<number> {
 >explicitReturnType10 : () => IterableIterator<number>
@@ -331,8 +331,8 @@ async function * explicitReturnType10(): IterableIterator<number> {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * explicitReturnType11(): Iterable<number> {
 >explicitReturnType11 : () => Iterable<number>
@@ -351,8 +351,8 @@ async function * explicitReturnType12(): Iterator<number> {
     yield 1;
 >yield 1 : undefined
 >        : ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 async function * yieldStar() {
 >yieldStar : () => AsyncGenerator<any, void, unknown>
diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.types b/tests/baselines/reference/typesWithSpecializedCallSignatures.types
index ea70c309c19..43f4a57540b 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.types
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.types
@@ -198,6 +198,6 @@ var r3: Base = c.foo('hm');
 >  : ^
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >    : ^^^ ^^    ^^^        ^^^ ^^     ^^^        ^^^ ^^      ^^^    ^^^
->'hm' : string
->     : ^^^^^^
+>'hm' : "hm"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
index cbd59b90fa1..567c0dd4d86 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
@@ -55,8 +55,8 @@ var c = new C('a');
 >           : ^
 >C : typeof C
 >  : ^^^^^^^^
->'a' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
 
 interface I {
     new(x: 'hi'): Derived1;
@@ -152,6 +152,6 @@ var r3: Base = new a('hm');
 >            : ^^^^
 >a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 >  : ^^^^^^^ ^^    ^^^        ^^^^^^^ ^^     ^^^        ^^^^^^^ ^^      ^^^    ^^^
->'hm' : string
->     : ^^^^^^
+>'hm' : "hm"
+>     : ^^^^
 
diff --git a/tests/baselines/reference/umd-augmentation-1.types b/tests/baselines/reference/umd-augmentation-1.types
index 06c368b50ac..c7f9c95e8f0 100644
--- a/tests/baselines/reference/umd-augmentation-1.types
+++ b/tests/baselines/reference/umd-augmentation-1.types
@@ -17,10 +17,10 @@ let v = new m.Vector(3, 2);
 >  : ^^^^^^^^
 >Vector : typeof m.Vector
 >       : ^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 
 let magnitude = m.getLength(v);
 >magnitude : number
@@ -49,10 +49,10 @@ let p: m.Point = v.translate(5, 5);
 >  : ^^^^^^^^
 >translate : (dx: number, dy: number) => m.Vector
 >          : ^  ^^      ^^  ^^      ^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 p = v.reverse();
 >p = v.reverse() : m.Point
diff --git a/tests/baselines/reference/umd-augmentation-2.types b/tests/baselines/reference/umd-augmentation-2.types
index b1c1a595237..6d5c3dde26b 100644
--- a/tests/baselines/reference/umd-augmentation-2.types
+++ b/tests/baselines/reference/umd-augmentation-2.types
@@ -14,10 +14,10 @@ let v = new Math2d.Vector(3, 2);
 >       : ^^^^^^^^^^^^^
 >Vector : typeof Math2d.Vector
 >       : ^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 
 let magnitude = Math2d.getLength(v);
 >magnitude : number
@@ -46,10 +46,10 @@ let p: Math2d.Point = v.translate(5, 5);
 >  : ^^^^^^^^^^^^^
 >translate : (dx: number, dy: number) => Math2d.Vector
 >          : ^  ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 p = v.reverse();
 >p = v.reverse() : Math2d.Point
diff --git a/tests/baselines/reference/umd-augmentation-3.types b/tests/baselines/reference/umd-augmentation-3.types
index e7a219249bf..2a8dbeeb746 100644
--- a/tests/baselines/reference/umd-augmentation-3.types
+++ b/tests/baselines/reference/umd-augmentation-3.types
@@ -17,10 +17,10 @@ let v = new m.Vector(3, 2);
 >  : ^^^^^^^^
 >Vector : typeof m.Vector
 >       : ^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 
 let magnitude = m.getLength(v);
 >magnitude : number
@@ -49,10 +49,10 @@ let p: m.Point = v.translate(5, 5);
 >  : ^^^^^^^^
 >translate : (dx: number, dy: number) => m.Vector
 >          : ^  ^^      ^^  ^^      ^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 p = v.reverse();
 >p = v.reverse() : m.Point
diff --git a/tests/baselines/reference/umd-augmentation-4.types b/tests/baselines/reference/umd-augmentation-4.types
index 3e86d997396..5d1217759b6 100644
--- a/tests/baselines/reference/umd-augmentation-4.types
+++ b/tests/baselines/reference/umd-augmentation-4.types
@@ -14,10 +14,10 @@ let v = new Math2d.Vector(3, 2);
 >       : ^^^^^^^^^^^^^
 >Vector : typeof Math2d.Vector
 >       : ^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 
 let magnitude = Math2d.getLength(v);
 >magnitude : number
@@ -46,10 +46,10 @@ let p: Math2d.Point = v.translate(5, 5);
 >  : ^^^^^^^^^^^^^
 >translate : (dx: number, dy: number) => Math2d.Vector
 >          : ^  ^^      ^^  ^^      ^^^^^^^^^^^^^^^^^^
->5 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>5 : 5
+>  : ^
 
 p = v.reverse();
 >p = v.reverse() : Math2d.Point
diff --git a/tests/baselines/reference/uncalledFunctionChecksInConditional2.types b/tests/baselines/reference/uncalledFunctionChecksInConditional2.types
index 02e8fdced9a..9895a5d755d 100644
--- a/tests/baselines/reference/uncalledFunctionChecksInConditional2.types
+++ b/tests/baselines/reference/uncalledFunctionChecksInConditional2.types
@@ -61,8 +61,8 @@ Type Count: 1,000
 >     : ^^^^^^^^^^^
 >measure : (measureName: string, startOrMeasureOptions?: string | PerformanceMeasureOptions, endMark?: string) => PerformanceMeasure
 >        : ^           ^^      ^^                     ^^^                                  ^^       ^^^      ^^^^^                  
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     perf.clearMarks("")
 >perf.clearMarks("") : void
@@ -73,8 +73,8 @@ Type Count: 1,000
 >     : ^^^^^^^^^^^
 >clearMarks : (markName?: string) => void
 >           : ^        ^^^      ^^^^^    
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
     perf.clearMeasures("")
 >perf.clearMeasures("") : void
@@ -85,8 +85,8 @@ Type Count: 1,000
 >     : ^^^^^^^^^^^
 >clearMeasures : (measureName?: string) => void
 >              : ^           ^^^      ^^^^^    
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
 
   // With ||
@@ -133,8 +133,8 @@ Type Count: 1,000
 >     : ^^^^^^^^^^^
 >mark : (markName: string, markOptions?: PerformanceMarkOptions) => PerformanceMark
 >     : ^        ^^      ^^           ^^^                      ^^^^^               
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
 
   // With ??
@@ -187,8 +187,8 @@ Type Count: 1,000
 >     : ^^^^^^^^^^^
 >mark : (markName: string, markOptions?: PerformanceMarkOptions) => PerformanceMark
 >     : ^        ^^      ^^           ^^^                      ^^^^^               
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
   }
 };
 
@@ -396,8 +396,8 @@ function isMobile() {
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >matchMedia : ((query: string) => MediaQueryList) & ((query: string) => MediaQueryList)
 >           : ^^     ^^      ^^^^^              ^^^^^^     ^^      ^^^^^              ^
->'(max-device-width: 680px)' : string
->                            : ^^^^^^
+>'(max-device-width: 680px)' : "(max-device-width: 680px)"
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     _isMobile = isMobileMatch && isMobileMatch.matches;
 >_isMobile = isMobileMatch && isMobileMatch.matches : boolean
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index 9939a1a8d19..ed76e069050 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -128,8 +128,8 @@ class MyView extends View {
 >      : ^ ^^^^^^^^^  ^^    ^^^^^^^^^^^^^^   ^^            ^^      ^^^^^     
 >data : IData[]
 >     : ^^^^^^^
->"series" : string
->         : ^^^^^^
+>"series" : "series"
+>         : ^^^^^^^^
 
         return _.map(allSeries, _.first);
 >_.map(allSeries, _.first) : ISeries[]
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 16f90060159..fd15bcdfd0b 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -27,12 +27,12 @@ _.each([1, 2, 3], (num) => alert(num.toString()));
 >     : ^^^ ^^    ^^   ^^        ^^                  ^^       ^^^   ^^^    ^^^ ^^    ^^             ^^        ^^                  ^^       ^^^   ^^^    ^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >(num) => alert(num.toString()) : (num: number) => void
 >                               : ^   ^^^^^^^^^^^^^^^^^
 >num : number
@@ -63,16 +63,16 @@ _.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(valu
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >two : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >three : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >(value: number, key?: string) => alert(value.toString()) : (value: number, key?: string) => void
 >                                                         : ^     ^^      ^^   ^^^      ^^^^^^^^^
 >value : number
@@ -103,12 +103,12 @@ _.map([1, 2, 3], (num) => num * 3);
 >    : ^^^ ^^ ^^    ^^   ^^        ^^               ^^       ^^^   ^^^   ^^^ ^^ ^^    ^^             ^^        ^^               ^^       ^^^   ^^^   ^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >(num) => num * 3 : (num: number) => number
 >                 : ^   ^^^^^^^^^^^^^^^^^^^
 >num : number
@@ -133,16 +133,16 @@ _.map({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => value * 3);
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >two : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >three : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >(value: number, key?: string) => value * 3 : (value: number, key?: string) => number
 >                                           : ^     ^^      ^^   ^^^      ^^^^^^^^^^^
 >value : number
@@ -169,12 +169,12 @@ var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0);
 >       : ^^^ ^^    ^^   ^^        ^^             ^^            ^^^ ^^       ^^^   ^^^ ^^^ ^^ ^^    ^^   ^^        ^^             ^^            ^^ ^^       ^^^   ^^^ ^^^ ^^    ^^             ^^        ^^             ^^            ^^^ ^^       ^^^   ^^^ ^^^ ^^ ^^    ^^             ^^        ^^             ^^            ^^ ^^       ^^^   ^^^ ^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >(memo, num) => memo + num : (memo: number, num: number) => number
 >                          : ^    ^^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >memo : number
@@ -187,8 +187,8 @@ var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0);
 >     : ^^^^^^
 >num : number
 >    : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 var list = [[0, 1], [2, 3], [4, 5]];
 >list : number[][]
@@ -259,18 +259,18 @@ var even = _.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 >     : ^^^ ^^    ^^   ^^        ^^                     ^^       ^^^   ^^^ ^^^ ^^    ^^             ^^        ^^                     ^^       ^^^   ^^^ ^^^
 >[1, 2, 3, 4, 5, 6] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 >(num) => num % 2 == 0 : (num: number) => boolean
 >                      : ^   ^^^^^^^^^^^^^^^^^^^^
 >num : number
@@ -299,18 +299,18 @@ var evens = _.filter([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 >       : ^^^ ^^    ^^   ^^        ^^                     ^^       ^^^   ^^^   ^^^ ^^    ^^             ^^        ^^                     ^^       ^^^   ^^^   ^^^
 >[1, 2, 3, 4, 5, 6] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 >(num) => num % 2 == 0 : (num: number) => boolean
 >                      : ^   ^^^^^^^^^^^^^^^^^^^^
 >num : number
@@ -409,18 +409,18 @@ var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 >       : ^^^ ^^    ^^   ^^        ^^                     ^^       ^^^   ^^^   ^^^ ^^    ^^             ^^        ^^                     ^^       ^^^   ^^^   ^^^
 >[1, 2, 3, 4, 5, 6] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 >(num) => num % 2 == 0 : (num: number) => boolean
 >                      : ^   ^^^^^^^^^^^^^^^^^^^^
 >num : number
@@ -489,14 +489,14 @@ _.contains([1, 2, 3], 3);
 >         : ^^^ ^^    ^^   ^^     ^^ ^^^       ^^^ ^^    ^^             ^^     ^^ ^^^       ^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 _.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
 >_.invoke([[5, 1, 7], [3, 2, 1]], 'sort') : any[]
@@ -525,7 +525,7 @@ _.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
 >  : ^
 >1 : 1
 >  : ^
->'sort' : string
+>'sort' : "sort"
 >       : ^^^^^^
 
 var stooges = [{ name: 'moe', age: 40 }, { name: 'larry', age: 50 }, { name: 'curly', age: 60 }];
@@ -575,7 +575,7 @@ _.pluck(stooges, 'name');
 >      : ^^^    ^^     ^^            ^^      ^^^     ^^^    ^^               ^^            ^^      ^^^     ^^^
 >stooges : { name: string; age: number; }[]
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'name' : string
+>'name' : "name"
 >       : ^^^^^^
 
 _.max(stooges, (stooge) => stooge.age);
@@ -639,18 +639,18 @@ _.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num));
 >       : ^^^ ^^    ^^   ^^        ^^                 ^^       ^^^   ^^^   ^^^ ^^    ^^             ^^        ^^                 ^^       ^^^   ^^^   ^^^ ^^    ^^   ^^            ^^      ^^^   ^^^ ^^    ^^             ^^            ^^      ^^^   ^^^
 >[1, 2, 3, 4, 5, 6] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 >(num) => Math.sin(num) : (num: number) => number
 >                       : ^   ^^^^^^^^^^^^^^^^^^^
 >num : number
@@ -679,12 +679,12 @@ _([1.3, 2.1, 2.4]).groupBy((e: number, i?: number, list?: number[]) => Math.floo
 >  : ^^^^^^^^^^^^^^^^^
 >[1.3, 2.1, 2.4] : number[]
 >                : ^^^^^^^^
->1.3 : number
->    : ^^^^^^
->2.1 : number
->    : ^^^^^^
->2.4 : number
->    : ^^^^^^
+>1.3 : 1.3
+>    : ^^^
+>2.1 : 2.1
+>    : ^^^
+>2.4 : 2.4
+>    : ^^^
 >groupBy : { (iterator?: Iterator_<number, any>, context?: any): Dictionary<number[]>; (propertyName: string): Dictionary<number[]>; }
 >        : ^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^            ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >(e: number, i?: number, list?: number[]) => Math.floor(e) : (e: number, i?: number, list?: number[]) => number
@@ -717,12 +717,12 @@ _.groupBy([1.3, 2.1, 2.4], (num: number) => Math.floor(num));
 >        : ^^^ ^^    ^^   ^^        ^^^                 ^^       ^^^   ^^^               ^^^ ^^    ^^             ^^        ^^^                 ^^       ^^^   ^^^               ^^^ ^^    ^^   ^^            ^^      ^^^               ^^^ ^^    ^^             ^^            ^^      ^^^               ^^^
 >[1.3, 2.1, 2.4] : number[]
 >                : ^^^^^^^^
->1.3 : number
->    : ^^^^^^
->2.1 : number
->    : ^^^^^^
->2.4 : number
->    : ^^^^^^
+>1.3 : 1.3
+>    : ^^^
+>2.1 : 2.1
+>    : ^^^
+>2.4 : 2.4
+>    : ^^^
 >(num: number) => Math.floor(num) : (num: number) => number
 >                                 : ^   ^^      ^^^^^^^^^^^
 >num : number
@@ -749,14 +749,14 @@ _.groupBy(['one', 'two', 'three'], 'length');
 >        : ^^^ ^^    ^^   ^^        ^^^                 ^^       ^^^   ^^^               ^^^ ^^    ^^             ^^        ^^^                 ^^       ^^^   ^^^               ^^^ ^^    ^^   ^^            ^^      ^^^               ^^^ ^^    ^^             ^^            ^^      ^^^               ^^^
 >['one', 'two', 'three'] : string[]
 >                        : ^^^^^^^^
->'one' : string
->      : ^^^^^^
->'two' : string
->      : ^^^^^^
->'three' : string
->        : ^^^^^^
->'length' : string
->         : ^^^^^^
+>'one' : "one"
+>      : ^^^^^
+>'two' : "two"
+>      : ^^^^^
+>'three' : "three"
+>        : ^^^^^^^
+>'length' : "length"
+>         : ^^^^^^^^
 
 _.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd');
 >_.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd') : Dictionary<number>
@@ -769,16 +769,16 @@ _.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd');
 >        : ^^^ ^^    ^^   ^^        ^^^                 ^^       ^^^   ^^^                  ^^^ ^^    ^^             ^^        ^^^                 ^^       ^^^   ^^^                  ^^^ ^^    ^^   ^^            ^^      ^^^                  ^^^ ^^    ^^             ^^            ^^      ^^^                  ^^^
 >[1, 2, 3, 4, 5] : number[]
 >                : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
 >(num) => num % 2 == 0 ? 'even' : 'odd' : (num: number) => "even" | "odd"
 >                                       : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >num : number
@@ -811,18 +811,18 @@ _.shuffle([1, 2, 3, 4, 5, 6]);
 >        : ^^^ ^^    ^^   ^^^   ^^^ ^^    ^^             ^^^   ^^^
 >[1, 2, 3, 4, 5, 6] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 // (function(){ return _.toArray(arguments).slice(1); })(1, 2, 3, 4);
 
@@ -839,16 +839,16 @@ _.size({ one: 1, two: 2, three: 3 });
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >one : number
 >    : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >two : number
 >    : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 >three : number
 >      : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 ///////////////////////////////////////////////////////////////////////////////////////
 
@@ -863,16 +863,16 @@ _.first([5, 4, 3, 2, 1]);
 >      : ^^^ ^^    ^^   ^^^ ^^^ ^^    ^^   ^^     ^^      ^^^   ^^^
 >[5, 4, 3, 2, 1] : number[]
 >                : ^^^^^^^^
->5 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>4 : 4
+>  : ^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 _.initial([5, 4, 3, 2, 1]);
 >_.initial([5, 4, 3, 2, 1]) : number
@@ -885,16 +885,16 @@ _.initial([5, 4, 3, 2, 1]);
 >        : ^^^ ^^    ^^   ^^^ ^^^ ^^    ^^   ^^     ^^      ^^^   ^^^
 >[5, 4, 3, 2, 1] : number[]
 >                : ^^^^^^^^
->5 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>4 : 4
+>  : ^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 _.last([5, 4, 3, 2, 1]);
 >_.last([5, 4, 3, 2, 1]) : number
@@ -907,16 +907,16 @@ _.last([5, 4, 3, 2, 1]);
 >     : ^^^ ^^    ^^   ^^^ ^^^ ^^    ^^   ^^     ^^      ^^^   ^^^
 >[5, 4, 3, 2, 1] : number[]
 >                : ^^^^^^^^
->5 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>4 : 4
+>  : ^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 _.rest([5, 4, 3, 2, 1]);
 >_.rest([5, 4, 3, 2, 1]) : number[]
@@ -929,16 +929,16 @@ _.rest([5, 4, 3, 2, 1]);
 >     : ^ ^^    ^^   ^^     ^^^      ^^^^^   
 >[5, 4, 3, 2, 1] : number[]
 >                : ^^^^^^^^
->5 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
+>4 : 4
+>  : ^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 _.compact([0, 1, false, 2, '', 3]);
 >_.compact([0, 1, false, 2, '', 3]) : (string | number | boolean)[]
@@ -1072,24 +1072,24 @@ _.without([1, 2, 1, 0, 3, 1, 4], 0, 1);
 >        : ^ ^^    ^^   ^^^^^      ^^   ^^^^^   
 >[1, 2, 1, 0, 3, 1, 4] : number[]
 >                      : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
+>0 : 0
+>  : ^
+>3 : 3
+>  : ^
+>1 : 1
+>  : ^
+>4 : 4
+>  : ^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
 _.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 >_.union([1, 2, 3], [101, 2, 1, 10], [2, 1]) : number[]
@@ -1102,28 +1102,28 @@ _.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 >      : ^ ^^^^^      ^^     ^^^^^   
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >[101, 2, 1, 10] : number[]
 >                : ^^^^^^^^
->101 : number
->    : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>101 : 101
+>    : ^^^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
+>10 : 10
+>   : ^^
 >[2, 1] : number[]
 >       : ^^^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 _.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 >_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]) : number[]
@@ -1136,28 +1136,28 @@ _.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 >             : ^ ^^^^^      ^^     ^^^^^   
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >[101, 2, 1, 10] : number[]
 >                : ^^^^^^^^
->101 : number
->    : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>101 : 101
+>    : ^^^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
+>10 : 10
+>   : ^^
 >[2, 1] : number[]
 >       : ^^^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
 
 _.difference([1, 2, 3, 4, 5], [5, 2, 10]);
 >_.difference([1, 2, 3, 4, 5], [5, 2, 10]) : number[]
@@ -1170,24 +1170,24 @@ _.difference([1, 2, 3, 4, 5], [5, 2, 10]);
 >           : ^ ^^    ^^   ^^^^^      ^^     ^^^^^   
 >[1, 2, 3, 4, 5] : number[]
 >                : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
->5 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>4 : 4
+>  : ^
+>5 : 5
+>  : ^
 >[5, 2, 10] : number[]
 >           : ^^^^^^^^
->5 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>5 : 5
+>  : ^
+>2 : 2
+>  : ^
+>10 : 10
+>   : ^^
 
 _.uniq([1, 2, 1, 3, 1, 4]);
 >_.uniq([1, 2, 1, 3, 1, 4]) : number[]
@@ -1200,18 +1200,18 @@ _.uniq([1, 2, 1, 3, 1, 4]);
 >     : ^^^ ^^    ^^   ^^        ^^^       ^^^   ^^^ ^^ ^^    ^^   ^^        ^^       ^^        ^^               ^^       ^^^   ^^^   ^^^
 >[1, 2, 1, 3, 1, 4] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->4 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>1 : 1
+>  : ^
+>3 : 3
+>  : ^
+>1 : 1
+>  : ^
+>4 : 4
+>  : ^
 
 _.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]);
 >_.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]) : Tuple3<string, number, boolean>[]
@@ -1224,20 +1224,20 @@ _.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]);
 >    : ^^^  ^^  ^^  ^^    ^^  ^^    ^^^                ^^^  ^^  ^^  ^^  ^^    ^^  ^^    ^^  ^^    ^^^                    ^^^  ^^  ^^  ^^  ^^  ^^    ^^  ^^    ^^  ^^    ^^  ^^    ^^^                        ^^^^^^      ^^       ^^^       ^^^
 >['moe', 'larry', 'curly'] : string[]
 >                          : ^^^^^^^^
->'moe' : string
->      : ^^^^^^
->'larry' : string
->        : ^^^^^^
->'curly' : string
->        : ^^^^^^
+>'moe' : "moe"
+>      : ^^^^^
+>'larry' : "larry"
+>        : ^^^^^^^
+>'curly' : "curly"
+>        : ^^^^^^^
 >[30, 40, 50] : number[]
 >             : ^^^^^^^^
->30 : number
->   : ^^^^^^
->40 : number
->   : ^^^^^^
->50 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
+>40 : 40
+>   : ^^
+>50 : 50
+>   : ^^
 >[true, false, false] : boolean[]
 >                     : ^^^^^^^^^
 >true : true
@@ -1258,12 +1258,12 @@ _.object(['moe', 'larry', 'curly'], [30, 40, 50]);
 >       : ^^^    ^^       ^^^   ^^^    ^^        ^^      ^^     ^^^   ^^^
 >['moe', 'larry', 'curly'] : string[]
 >                          : ^^^^^^^^
->'moe' : string
->      : ^^^^^^
->'larry' : string
->        : ^^^^^^
->'curly' : string
->        : ^^^^^^
+>'moe' : "moe"
+>      : ^^^^^
+>'larry' : "larry"
+>        : ^^^^^^^
+>'curly' : "curly"
+>        : ^^^^^^^
 >[30, 40, 50] : number[]
 >             : ^^^^^^^^
 >30 : 30
@@ -1314,14 +1314,14 @@ _.indexOf([1, 2, 3], 2);
 >        : ^ ^^    ^^   ^^     ^^ ^^        ^^^       ^^^^^      
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 
 _.lastIndexOf([1, 2, 3, 1, 2, 3], 2);
 >_.lastIndexOf([1, 2, 3, 1, 2, 3], 2) : number
@@ -1334,20 +1334,20 @@ _.lastIndexOf([1, 2, 3, 1, 2, 3], 2);
 >            : ^ ^^    ^^   ^^     ^^ ^^         ^^^      ^^^^^      
 >[1, 2, 3, 1, 2, 3] : number[]
 >                   : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>2 : 2
+>  : ^
 
 _.sortedIndex([10, 20, 30, 40, 50], 35);
 >_.sortedIndex([10, 20, 30, 40, 50], 35) : number
@@ -1360,18 +1360,18 @@ _.sortedIndex([10, 20, 30, 40, 50], 35);
 >            : ^^^ ^^    ^^   ^^   ^^ ^^            ^^      ^^^      ^^^ ^^    ^^   ^^   ^^ ^^        ^^^                 ^^       ^^^   ^^^      ^^^
 >[10, 20, 30, 40, 50] : number[]
 >                     : ^^^^^^^^
->10 : number
->   : ^^^^^^
->20 : number
->   : ^^^^^^
->30 : number
->   : ^^^^^^
->40 : number
->   : ^^^^^^
->50 : number
->   : ^^^^^^
->35 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
+>20 : 20
+>   : ^^
+>30 : 30
+>   : ^^
+>40 : 40
+>   : ^^
+>50 : 50
+>   : ^^
+>35 : 35
+>   : ^^
 
 _.range(10);
 >_.range(10) : number[]
@@ -1382,8 +1382,8 @@ _.range(10);
 >  : ^^^^^^^^^^^^^^^^^
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 >      : ^^^    ^^      ^^^        ^^^     ^^      ^^    ^^      ^^    ^^^      ^^^        ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 _.range(1, 11);
 >_.range(1, 11) : number[]
@@ -1394,10 +1394,10 @@ _.range(1, 11);
 >  : ^^^^^^^^^^^^^^^^^
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 >      : ^^^    ^^      ^^^        ^^^     ^^      ^^    ^^      ^^    ^^^      ^^^        ^^^
->1 : number
->  : ^^^^^^
->11 : number
->   : ^^^^^^
+>1 : 1
+>  : ^
+>11 : 11
+>   : ^^
 
 _.range(0, 30, 5);
 >_.range(0, 30, 5) : number[]
@@ -1408,12 +1408,12 @@ _.range(0, 30, 5);
 >  : ^^^^^^^^^^^^^^^^^
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 >      : ^^^    ^^      ^^^        ^^^     ^^      ^^    ^^      ^^    ^^^      ^^^        ^^^
->0 : number
->  : ^^^^^^
->30 : number
->   : ^^^^^^
->5 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>30 : 30
+>   : ^^
+>5 : 5
+>  : ^
 
 _.range(0, 30, 5);
 >_.range(0, 30, 5) : number[]
@@ -1424,12 +1424,12 @@ _.range(0, 30, 5);
 >  : ^^^^^^^^^^^^^^^^^
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 >      : ^^^    ^^      ^^^        ^^^     ^^      ^^    ^^      ^^    ^^^      ^^^        ^^^
->0 : number
->  : ^^^^^^
->30 : number
->   : ^^^^^^
->5 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>30 : 30
+>   : ^^
+>5 : 5
+>  : ^
 
 _.range(0);
 >_.range(0) : number[]
@@ -1440,8 +1440,8 @@ _.range(0);
 >  : ^^^^^^^^^^^^^^^^^
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 >      : ^^^    ^^      ^^^        ^^^     ^^      ^^    ^^      ^^    ^^^      ^^^        ^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 ///////////////////////////////////////////////////////////////////////////////////////
 
@@ -1667,8 +1667,8 @@ _.delay(log, 1000, 'logged later');
 >      : ^    ^^        ^^    ^^      ^^^^^    ^^     ^^^^^      
 >log : (message?: string, ...rest: string[]) => void
 >    : ^       ^^^      ^^^^^    ^^        ^^^^^^^^^
->1000 : number
->     : ^^^^^^
+>1000 : 1000
+>     : ^^^^
 >'logged later' : "logged later"
 >               : ^^^^^^^^^^^^^^
 
@@ -1687,8 +1687,8 @@ _.defer(function () { alert('deferred'); });
 >                  : ^^^^
 >alert : { (message?: any): void; (x: string): void; }
 >      : ^^^       ^^^   ^^^    ^^^ ^^      ^^^    ^^^
->'deferred' : string
->           : ^^^^^^
+>'deferred' : "deferred"
+>           : ^^^^^^^^^^
 
 var updatePosition = () => alert('updating position...');
 >updatePosition : () => void
@@ -1699,8 +1699,8 @@ var updatePosition = () => alert('updating position...');
 >                              : ^^^^
 >alert : { (message?: any): void; (x: string): void; }
 >      : ^^^       ^^^   ^^^    ^^^ ^^      ^^^    ^^^
->'updating position...' : string
->                       : ^^^^^^
+>'updating position...' : "updating position..."
+>                       : ^^^^^^^^^^^^^^^^^^^^^^
 
 var throttled = _.throttle(updatePosition, 100);
 >throttled : () => void
@@ -1715,8 +1715,8 @@ var throttled = _.throttle(updatePosition, 100);
 >         : ^ ^^^^^^^^^        ^^    ^^ ^^    ^^      ^^^^^ 
 >updatePosition : () => void
 >               : ^^^^^^^^^^
->100 : number
->    : ^^^^^^
+>100 : 100
+>    : ^^^
 
 $(null).scroll(throttled);
 >$(null).scroll(throttled) : any
@@ -1741,8 +1741,8 @@ var calculateLayout = () => alert('calculating layout...');
 >                               : ^^^^
 >alert : { (message?: any): void; (x: string): void; }
 >      : ^^^       ^^^   ^^^    ^^^ ^^      ^^^    ^^^
->'calculating layout...' : string
->                        : ^^^^^^
+>'calculating layout...' : "calculating layout..."
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
 
 var lazyLayout = _.debounce(calculateLayout, 300);
 >lazyLayout : () => void
@@ -1757,8 +1757,8 @@ var lazyLayout = _.debounce(calculateLayout, 300);
 >         : ^ ^^^^^^^^^        ^^    ^^ ^^    ^^      ^^         ^^^       ^^^^^ 
 >calculateLayout : () => void
 >                : ^^^^^^^^^^
->300 : number
->    : ^^^^^^
+>300 : 300
+>    : ^^^
 
 $(null).resize(lazyLayout);
 >$(null).resize(lazyLayout) : any
@@ -1783,8 +1783,8 @@ var createApplication = () => alert('creating application...');
 >                                 : ^^^^
 >alert : { (message?: any): void; (x: string): void; }
 >      : ^^^       ^^^   ^^^    ^^^ ^^      ^^^    ^^^
->'creating application...' : string
->                          : ^^^^^^
+>'creating application...' : "creating application..."
+>                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 var initialize = _.once(createApplication);
 >initialize : () => void
@@ -1825,8 +1825,8 @@ var render = () => alert("rendering...");
 >                      : ^^^^
 >alert : { (message?: any): void; (x: string): void; }
 >      : ^^^       ^^^   ^^^    ^^^ ^^      ^^^    ^^^
->"rendering..." : string
->               : ^^^^^^
+>"rendering..." : "rendering..."
+>               : ^^^^^^^^^^^^^^
 
 var renderNotes = _.after(notes.length, render);
 >renderNotes : () => void
@@ -2111,8 +2111,8 @@ _.extend({ name: 'moe' }, { age: 50 });
 >                : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->'moe' : string
->      : ^^^^^^
+>'moe' : "moe"
+>      : ^^^^^
 >{ age: 50 } : { age: number; }
 >            : ^^^^^^^^^^^^^^^^
 >age : number
@@ -2133,20 +2133,20 @@ _.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->'moe' : string
->      : ^^^^^^
+>'moe' : "moe"
+>      : ^^^^^
 >age : number
 >    : ^^^^^^
->50 : number
->   : ^^^^^^
+>50 : 50
+>   : ^^
 >userid : string
 >       : ^^^^^^
->'moe1' : string
+>'moe1' : "moe1"
 >       : ^^^^^^
->'name' : string
+>'name' : "name"
 >       : ^^^^^^
->'age' : string
->      : ^^^^^^
+>'age' : "age"
+>      : ^^^^^
 
 _.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid');
 >_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid') : { name: string; age: number; userid: string; }
@@ -2161,18 +2161,18 @@ _.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid');
 >                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->'moe' : string
->      : ^^^^^^
+>'moe' : "moe"
+>      : ^^^^^
 >age : number
 >    : ^^^^^^
->50 : number
->   : ^^^^^^
+>50 : 50
+>   : ^^
 >userid : string
 >       : ^^^^^^
->'moe1' : string
+>'moe1' : "moe1"
 >       : ^^^^^^
->'userid' : string
->         : ^^^^^^
+>'userid' : "userid"
+>         : ^^^^^^^^
 
 var iceCream = { flavor: "chocolate" };
 >iceCream : { flavor: string; }
@@ -2219,8 +2219,8 @@ _.clone({ name: 'moe' });
 >                : ^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
->'moe' : string
->      : ^^^^^^
+>'moe' : "moe"
+>      : ^^^^^
 
 _.chain([1, 2, 3, 200])
 >_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num })    .value() : number[]
@@ -2249,14 +2249,14 @@ _.chain([1, 2, 3, 200])
 >      : ^^^ ^^    ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^ ^^    ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^ ^^   ^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^
 >[1, 2, 3, 200] : number[]
 >               : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->200 : number
->    : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
+>200 : 200
+>    : ^^^
 
     .filter(function (num) { return num % 2 == 0; })
 >filter : (iterator: Iterator_<number, boolean>, context?: any) => Underscore.ChainedArray<number>
@@ -2325,8 +2325,8 @@ _.has({ a: 1, b: 2, c: 3 }, "b");
 >  : ^^^^^^
 >3 : 3
 >  : ^
->"b" : string
->    : ^^^^^^
+>"b" : "b"
+>    : ^^^
 
 var moe = { name: 'moe', luckyNumbers: [13, 27, 34] };
 >moe : { name: string; luckyNumbers: number[]; }
@@ -2749,8 +2749,8 @@ _.times(3, function (n) { genie.grantWishNumber(n); });
 >  : ^^^^^^^^^^^^^^^^^
 >times : <U>(n: number, iterator: Iterator_<number, U>, context?: any) => U[]
 >      : ^ ^^ ^^      ^^        ^^                    ^^       ^^^   ^^^^^   
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >function (n) { genie.grantWishNumber(n); } : (n: number) => void
 >                                           : ^ ^^^^^^^^^^^^^^^^^
 >n : number
@@ -2775,10 +2775,10 @@ _.random(0, 100);
 >  : ^^^^^^^^^^^^^^^^^
 >random : { (max: number): number; (min: number, max: number): number; }
 >       : ^^^   ^^      ^^^      ^^^   ^^      ^^   ^^      ^^^      ^^^
->0 : number
->  : ^^^^^^
->100 : number
->    : ^^^^^^
+>0 : 0
+>  : ^
+>100 : 100
+>    : ^^^
 
 _.mixin({
 >_.mixin({    capitalize: function (string) {        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();    }}) : void
@@ -2850,8 +2850,8 @@ _.mixin({
 >           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >_ : Underscore.Static
 >  : ^^^^^^^^^^^^^^^^^
->"fabio" : string
->        : ^^^^^^
+>"fabio" : "fabio"
+>        : ^^^^^^^
 >capitalize : any
 >           : ^^^
 
@@ -2864,8 +2864,8 @@ _.uniqueId('contact_');
 >  : ^^^^^^^^^^^^^^^^^
 >uniqueId : { (): number; (prefix: string): string; }
 >         : ^^^^^^      ^^^      ^^      ^^^      ^^^
->'contact_' : string
->           : ^^^^^^
+>'contact_' : "contact_"
+>           : ^^^^^^^^^^
 
 _.escape('Curly, Larry & Moe');
 >_.escape('Curly, Larry & Moe') : string
@@ -2876,8 +2876,8 @@ _.escape('Curly, Larry & Moe');
 >  : ^^^^^^^^^^^^^^^^^
 >escape : (s: string) => string
 >       : ^ ^^      ^^^^^      
->'Curly, Larry & Moe' : string
->                     : ^^^^^^
+>'Curly, Larry & Moe' : "Curly, Larry & Moe"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 var object = { cheese: 'crumpets', stuff: function () { return 'nonsense'; } };
 >object : { cheese: string; stuff: () => string; }
@@ -2906,8 +2906,8 @@ _.result(object, 'cheese');
 >       : ^      ^^   ^^        ^^      ^^^^^   
 >object : { cheese: string; stuff: () => string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'cheese' : string
->         : ^^^^^^
+>'cheese' : "cheese"
+>         : ^^^^^^^^
 
 _.result(object, 'stuff');
 >_.result(object, 'stuff') : any
@@ -2920,8 +2920,8 @@ _.result(object, 'stuff');
 >       : ^      ^^   ^^        ^^      ^^^^^   
 >object : { cheese: string; stuff: () => string; }
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'stuff' : string
->        : ^^^^^^
+>'stuff' : "stuff"
+>        : ^^^^^^^
 
 var compiled = _.template("hello: <%= name %>");
 >compiled : (data: any) => string
@@ -2934,8 +2934,8 @@ var compiled = _.template("hello: <%= name %>");
 >  : ^^^^^^^^^^^^^^^^^
 >template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >         : ^^^              ^^      ^^^                     ^^^              ^^      ^^    ^^   ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"hello: <%= name %>" : string
->                     : ^^^^^^
+>"hello: <%= name %>" : "hello: <%= name %>"
+>                     : ^^^^^^^^^^^^^^^^^^^^
 
 compiled({ name: 'moe' });
 >compiled({ name: 'moe' }) : string
@@ -2990,8 +2990,8 @@ var template = _.template("<b><%- value %></b>");
 >  : ^^^^^^^^^^^^^^^^^
 >template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >         : ^^^              ^^      ^^^                     ^^^              ^^      ^^    ^^   ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"<b><%- value %></b>" : string
->                      : ^^^^^^
+>"<b><%- value %></b>" : "<b><%- value %></b>"
+>                      : ^^^^^^^^^^^^^^^^^^^^^
 
 template({ value: '<script>' });
 >template({ value: '<script>' }) : string
@@ -3016,8 +3016,8 @@ var compiled2 = _.template("<% print('Hello ' + epithet); %>");
 >  : ^^^^^^^^^^^^^^^^^
 >template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >         : ^^^              ^^      ^^^                     ^^^              ^^      ^^    ^^   ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"<% print('Hello ' + epithet); %>" : string
->                                   : ^^^^^^
+>"<% print('Hello ' + epithet); %>" : "<% print('Hello ' + epithet); %>"
+>                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 compiled2({ epithet: "stooge" });
 >compiled2({ epithet: "stooge" }) : string
@@ -3061,8 +3061,8 @@ var template2 = _.template("Hello {{ name }}!");
 >  : ^^^^^^^^^^^^^^^^^
 >template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >         : ^^^              ^^      ^^^                     ^^^              ^^      ^^    ^^   ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"Hello {{ name }}!" : string
->                    : ^^^^^^
+>"Hello {{ name }}!" : "Hello {{ name }}!"
+>                    : ^^^^^^^^^^^^^^^^^^^
 
 template2({ name: "Mustache" });
 >template2({ name: "Mustache" }) : string
@@ -3085,8 +3085,8 @@ _.template("Using 'with': <%= data.answer %>", { answer: 'no' }, { variable: 'da
 >  : ^^^^^^^^^^^^^^^^^
 >template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >         : ^^^              ^^      ^^^                     ^^^              ^^      ^^    ^^   ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
->"Using 'with': <%= data.answer %>" : string
->                                   : ^^^^^^
+>"Using 'with': <%= data.answer %>" : "Using 'with': <%= data.answer %>"
+>                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{ answer: 'no' } : { answer: string; }
 >                 : ^^^^^^^^^^^^^^^^^^^
 >answer : string
@@ -3097,7 +3097,7 @@ _.template("Using 'with': <%= data.answer %>", { answer: 'no' }, { variable: 'da
 >                     : ^^^^^^^^^^^^^^^^^^^^^
 >variable : string
 >         : ^^^^^^
->'data' : string
+>'data' : "data"
 >       : ^^^^^^
 
 === underscoreTest1_underscore.ts ===
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.types b/tests/baselines/reference/unicodeEscapesInJsxtags.types
index d40dd32e393..f17acb48e1f 100644
--- a/tests/baselines/reference/unicodeEscapesInJsxtags.types
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.types
@@ -86,8 +86,8 @@ const x = { video: () => null }
 >           : ^ ^^              ^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 ; <x.\u0076ideo />
 ><x.\u0076ideo /> : JSX.Element
@@ -130,8 +130,8 @@ const x = { video: () => null }
 >             : ^ ^^              ^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 
 // attribute name
 ;<video data-\u0076ideo />
diff --git a/tests/baselines/reference/unicodeEscapesInNames01(target=es2015).types b/tests/baselines/reference/unicodeEscapesInNames01(target=es2015).types
index 34a3b03c9b6..710c54f8ca8 100644
--- a/tests/baselines/reference/unicodeEscapesInNames01(target=es2015).types
+++ b/tests/baselines/reference/unicodeEscapesInNames01(target=es2015).types
@@ -63,16 +63,16 @@ export class IdentifierNameWithEscape1 {
 
     constructor() {
         this.\u0078 = 0;
->this.\u0078 = 0 : number
->                : ^^^^^^
+>this.\u0078 = 0 : 0
+>                : ^
 >this.\u0078 : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >\u0078 : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -80,16 +80,16 @@ export class IdentifierNameWithEscape1 {
 >        : ^^^^^^^^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -104,16 +104,16 @@ export class IdentifierNameWithEscape2 {
 
     constructor() {
         this.x\u0078 = 0;
->this.x\u0078 = 0 : number
->                 : ^^^^^^
+>this.x\u0078 = 0 : 0
+>                 : ^
 >this.x\u0078 : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >x\u0078 : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -121,16 +121,16 @@ export class IdentifierNameWithEscape2 {
 >        : ^^^^^^^^^^
 
         this.xx = 42;
->this.xx = 42 : number
->             : ^^^^^^
+>this.xx = 42 : 42
+>             : ^^
 >this.xx : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >xx : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -145,16 +145,16 @@ export class IdentifierNameWithExtendedEscape1 {
 
     constructor() {
         this.\u{78} = 0;
->this.\u{78} = 0 : number
->                : ^^^^^^
+>this.\u{78} = 0 : 0
+>                : ^
 >this.\u{78} : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >\u{78} : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -162,16 +162,16 @@ export class IdentifierNameWithExtendedEscape1 {
 >        : ^^^^^^^^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -186,16 +186,16 @@ export class IdentifierNameWithExtendedEscape2 {
 
     constructor() {
         this.x\u{78} = 0;
->this.x\u{78} = 0 : number
->                 : ^^^^^^
+>this.x\u{78} = 0 : 0
+>                 : ^
 >this.x\u{78} : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >x\u{78} : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -203,16 +203,16 @@ export class IdentifierNameWithExtendedEscape2 {
 >        : ^^^^^^^^^^
 
         this.xx = 42;
->this.xx = 42 : number
->             : ^^^^^^
+>this.xx = 42 : 42
+>             : ^^
 >this.xx : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >xx : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -227,14 +227,14 @@ export class PrivateIdentifierWithEscape1 {
 
     constructor() {
         this.#\u0078 = 0;
->this.#\u0078 = 0 : number
->                 : ^^^^^^
+>this.#\u0078 = 0 : 0
+>                 : ^
 >this.#\u0078 : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -242,14 +242,14 @@ export class PrivateIdentifierWithEscape1 {
 >        : ^^^^^^^^^^
 
         this.#x = 42;
->this.#x = 42 : number
->             : ^^^^^^
+>this.#x = 42 : 42
+>             : ^^
 >this.#x : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -264,14 +264,14 @@ export class PrivateIdentifierWithEscape2 {
 
     constructor() {
         this.#x\u0078 = 0;
->this.#x\u0078 = 0 : number
->                  : ^^^^^^
+>this.#x\u0078 = 0 : 0
+>                  : ^
 >this.#x\u0078 : number
 >              : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -279,14 +279,14 @@ export class PrivateIdentifierWithEscape2 {
 >        : ^^^^^^^^^^
 
         this.#xx = 42;
->this.#xx = 42 : number
->              : ^^^^^^
+>this.#xx = 42 : 42
+>              : ^^
 >this.#xx : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -301,14 +301,14 @@ export class PrivateIdentifierWithExtendedEscape1 {
 
     constructor() {
         this.#\u{78} = 0;
->this.#\u{78} = 0 : number
->                 : ^^^^^^
+>this.#\u{78} = 0 : 0
+>                 : ^
 >this.#\u{78} : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -316,14 +316,14 @@ export class PrivateIdentifierWithExtendedEscape1 {
 >        : ^^^^^^^^^^
 
         this.#x = 42;
->this.#x = 42 : number
->             : ^^^^^^
+>this.#x = 42 : 42
+>             : ^^
 >this.#x : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -338,14 +338,14 @@ export class PrivateIdentifierWithExtendedEscape2 {
 
     constructor() {
         this.#x\u{78} = 0;
->this.#x\u{78} = 0 : number
->                  : ^^^^^^
+>this.#x\u{78} = 0 : 0
+>                  : ^
 >this.#x\u{78} : number
 >              : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -353,14 +353,14 @@ export class PrivateIdentifierWithExtendedEscape2 {
 >        : ^^^^^^^^^^
 
         this.#xx = 42;
->this.#xx = 42 : number
->              : ^^^^^^
+>this.#xx = 42 : 42
+>              : ^^
 >this.#xx : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/unicodeEscapesInNames01(target=es5).types b/tests/baselines/reference/unicodeEscapesInNames01(target=es5).types
index 34a3b03c9b6..710c54f8ca8 100644
--- a/tests/baselines/reference/unicodeEscapesInNames01(target=es5).types
+++ b/tests/baselines/reference/unicodeEscapesInNames01(target=es5).types
@@ -63,16 +63,16 @@ export class IdentifierNameWithEscape1 {
 
     constructor() {
         this.\u0078 = 0;
->this.\u0078 = 0 : number
->                : ^^^^^^
+>this.\u0078 = 0 : 0
+>                : ^
 >this.\u0078 : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >\u0078 : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -80,16 +80,16 @@ export class IdentifierNameWithEscape1 {
 >        : ^^^^^^^^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -104,16 +104,16 @@ export class IdentifierNameWithEscape2 {
 
     constructor() {
         this.x\u0078 = 0;
->this.x\u0078 = 0 : number
->                 : ^^^^^^
+>this.x\u0078 = 0 : 0
+>                 : ^
 >this.x\u0078 : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >x\u0078 : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -121,16 +121,16 @@ export class IdentifierNameWithEscape2 {
 >        : ^^^^^^^^^^
 
         this.xx = 42;
->this.xx = 42 : number
->             : ^^^^^^
+>this.xx = 42 : 42
+>             : ^^
 >this.xx : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >xx : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -145,16 +145,16 @@ export class IdentifierNameWithExtendedEscape1 {
 
     constructor() {
         this.\u{78} = 0;
->this.\u{78} = 0 : number
->                : ^^^^^^
+>this.\u{78} = 0 : 0
+>                : ^
 >this.\u{78} : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >\u{78} : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -162,16 +162,16 @@ export class IdentifierNameWithExtendedEscape1 {
 >        : ^^^^^^^^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -186,16 +186,16 @@ export class IdentifierNameWithExtendedEscape2 {
 
     constructor() {
         this.x\u{78} = 0;
->this.x\u{78} = 0 : number
->                 : ^^^^^^
+>this.x\u{78} = 0 : 0
+>                 : ^
 >this.x\u{78} : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >x\u{78} : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -203,16 +203,16 @@ export class IdentifierNameWithExtendedEscape2 {
 >        : ^^^^^^^^^^
 
         this.xx = 42;
->this.xx = 42 : number
->             : ^^^^^^
+>this.xx = 42 : 42
+>             : ^^
 >this.xx : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >xx : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -227,14 +227,14 @@ export class PrivateIdentifierWithEscape1 {
 
     constructor() {
         this.#\u0078 = 0;
->this.#\u0078 = 0 : number
->                 : ^^^^^^
+>this.#\u0078 = 0 : 0
+>                 : ^
 >this.#\u0078 : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -242,14 +242,14 @@ export class PrivateIdentifierWithEscape1 {
 >        : ^^^^^^^^^^
 
         this.#x = 42;
->this.#x = 42 : number
->             : ^^^^^^
+>this.#x = 42 : 42
+>             : ^^
 >this.#x : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -264,14 +264,14 @@ export class PrivateIdentifierWithEscape2 {
 
     constructor() {
         this.#x\u0078 = 0;
->this.#x\u0078 = 0 : number
->                  : ^^^^^^
+>this.#x\u0078 = 0 : 0
+>                  : ^
 >this.#x\u0078 : number
 >              : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -279,14 +279,14 @@ export class PrivateIdentifierWithEscape2 {
 >        : ^^^^^^^^^^
 
         this.#xx = 42;
->this.#xx = 42 : number
->              : ^^^^^^
+>this.#xx = 42 : 42
+>              : ^^
 >this.#xx : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -301,14 +301,14 @@ export class PrivateIdentifierWithExtendedEscape1 {
 
     constructor() {
         this.#\u{78} = 0;
->this.#\u{78} = 0 : number
->                 : ^^^^^^
+>this.#\u{78} = 0 : 0
+>                 : ^
 >this.#\u{78} : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -316,14 +316,14 @@ export class PrivateIdentifierWithExtendedEscape1 {
 >        : ^^^^^^^^^^
 
         this.#x = 42;
->this.#x = 42 : number
->             : ^^^^^^
+>this.#x = 42 : 42
+>             : ^^
 >this.#x : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -338,14 +338,14 @@ export class PrivateIdentifierWithExtendedEscape2 {
 
     constructor() {
         this.#x\u{78} = 0;
->this.#x\u{78} = 0 : number
->                  : ^^^^^^
+>this.#x\u{78} = 0 : 0
+>                  : ^
 >this.#x\u{78} : number
 >              : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -353,14 +353,14 @@ export class PrivateIdentifierWithExtendedEscape2 {
 >        : ^^^^^^^^^^
 
         this.#xx = 42;
->this.#xx = 42 : number
->              : ^^^^^^
+>this.#xx = 42 : 42
+>              : ^^
 >this.#xx : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/unicodeEscapesInNames01(target=esnext).types b/tests/baselines/reference/unicodeEscapesInNames01(target=esnext).types
index 34a3b03c9b6..710c54f8ca8 100644
--- a/tests/baselines/reference/unicodeEscapesInNames01(target=esnext).types
+++ b/tests/baselines/reference/unicodeEscapesInNames01(target=esnext).types
@@ -63,16 +63,16 @@ export class IdentifierNameWithEscape1 {
 
     constructor() {
         this.\u0078 = 0;
->this.\u0078 = 0 : number
->                : ^^^^^^
+>this.\u0078 = 0 : 0
+>                : ^
 >this.\u0078 : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >\u0078 : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -80,16 +80,16 @@ export class IdentifierNameWithEscape1 {
 >        : ^^^^^^^^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -104,16 +104,16 @@ export class IdentifierNameWithEscape2 {
 
     constructor() {
         this.x\u0078 = 0;
->this.x\u0078 = 0 : number
->                 : ^^^^^^
+>this.x\u0078 = 0 : 0
+>                 : ^
 >this.x\u0078 : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >x\u0078 : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -121,16 +121,16 @@ export class IdentifierNameWithEscape2 {
 >        : ^^^^^^^^^^
 
         this.xx = 42;
->this.xx = 42 : number
->             : ^^^^^^
+>this.xx = 42 : 42
+>             : ^^
 >this.xx : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >xx : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -145,16 +145,16 @@ export class IdentifierNameWithExtendedEscape1 {
 
     constructor() {
         this.\u{78} = 0;
->this.\u{78} = 0 : number
->                : ^^^^^^
+>this.\u{78} = 0 : 0
+>                : ^
 >this.\u{78} : number
 >            : ^^^^^^
 >this : this
 >     : ^^^^
 >\u{78} : number
 >       : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -162,16 +162,16 @@ export class IdentifierNameWithExtendedEscape1 {
 >        : ^^^^^^^^^^
 
         this.x = 42;
->this.x = 42 : number
->            : ^^^^^^
+>this.x = 42 : 42
+>            : ^^
 >this.x : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >x : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -186,16 +186,16 @@ export class IdentifierNameWithExtendedEscape2 {
 
     constructor() {
         this.x\u{78} = 0;
->this.x\u{78} = 0 : number
->                 : ^^^^^^
+>this.x\u{78} = 0 : 0
+>                 : ^
 >this.x\u{78} : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
 >x\u{78} : number
 >        : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -203,16 +203,16 @@ export class IdentifierNameWithExtendedEscape2 {
 >        : ^^^^^^^^^^
 
         this.xx = 42;
->this.xx = 42 : number
->             : ^^^^^^
+>this.xx = 42 : 42
+>             : ^^
 >this.xx : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
 >xx : number
 >   : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -227,14 +227,14 @@ export class PrivateIdentifierWithEscape1 {
 
     constructor() {
         this.#\u0078 = 0;
->this.#\u0078 = 0 : number
->                 : ^^^^^^
+>this.#\u0078 = 0 : 0
+>                 : ^
 >this.#\u0078 : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -242,14 +242,14 @@ export class PrivateIdentifierWithEscape1 {
 >        : ^^^^^^^^^^
 
         this.#x = 42;
->this.#x = 42 : number
->             : ^^^^^^
+>this.#x = 42 : 42
+>             : ^^
 >this.#x : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -264,14 +264,14 @@ export class PrivateIdentifierWithEscape2 {
 
     constructor() {
         this.#x\u0078 = 0;
->this.#x\u0078 = 0 : number
->                  : ^^^^^^
+>this.#x\u0078 = 0 : 0
+>                  : ^
 >this.#x\u0078 : number
 >              : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -279,14 +279,14 @@ export class PrivateIdentifierWithEscape2 {
 >        : ^^^^^^^^^^
 
         this.#xx = 42;
->this.#xx = 42 : number
->              : ^^^^^^
+>this.#xx = 42 : 42
+>              : ^^
 >this.#xx : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -301,14 +301,14 @@ export class PrivateIdentifierWithExtendedEscape1 {
 
     constructor() {
         this.#\u{78} = 0;
->this.#\u{78} = 0 : number
->                 : ^^^^^^
+>this.#\u{78} = 0 : 0
+>                 : ^
 >this.#\u{78} : number
 >             : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -316,14 +316,14 @@ export class PrivateIdentifierWithExtendedEscape1 {
 >        : ^^^^^^^^^^
 
         this.#x = 42;
->this.#x = 42 : number
->             : ^^^^^^
+>this.#x = 42 : 42
+>             : ^^
 >this.#x : number
 >        : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
@@ -338,14 +338,14 @@ export class PrivateIdentifierWithExtendedEscape2 {
 
     constructor() {
         this.#x\u{78} = 0;
->this.#x\u{78} = 0 : number
->                  : ^^^^^^
+>this.#x\u{78} = 0 : 0
+>                  : ^
 >this.#x\u{78} : number
 >              : ^^^^^^
 >this : this
 >     : ^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 
     doThing() {
@@ -353,14 +353,14 @@ export class PrivateIdentifierWithExtendedEscape2 {
 >        : ^^^^^^^^^^
 
         this.#xx = 42;
->this.#xx = 42 : number
->              : ^^^^^^
+>this.#xx = 42 : 42
+>              : ^^
 >this.#xx : number
 >         : ^^^^^^
 >this : this
 >     : ^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
     }
 }
 
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types
index df422f49899..cc561770d80 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types
@@ -21,21 +21,21 @@ if (Math.random()) {
 >       : ^^^^^^      
 
     𐊧 = "hello";
->𐊧 = "hello" : string
->             : ^^^^^^
+>𐊧 = "hello" : "hello"
+>             : ^^^^^^^
 >𐊧 : string
 >   : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 }
 else {
     \u{102A7} = "hallo";
->\u{102A7} = "hallo" : string
->                    : ^^^^^^
+>\u{102A7} = "hallo" : "hallo"
+>                    : ^^^^^^^
 >\u{102A7} : string
 >          : ^^^^^^
->"hallo" : string
->        : ^^^^^^
+>"hallo" : "hallo"
+>        : ^^^^^^^
 }
 
 class Foo {
@@ -48,16 +48,16 @@ class Foo {
 
     constructor() {
         this.\u{102A7} = " world";
->this.\u{102A7} = " world" : string
->                          : ^^^^^^
+>this.\u{102A7} = " world" : " world"
+>                          : ^^^^^^^^
 >this.\u{102A7} : string
 >               : ^^^^^^
 >this : this
 >     : ^^^^
 >\u{102A7} : string
 >          : ^^^^^^
->" world" : string
->         : ^^^^^^
+>" world" : " world"
+>         : ^^^^^^^^
     }
     methodA() {
 >methodA : () => string
diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types
index 99eb3a473d5..1c0e04a88fb 100644
--- a/tests/baselines/reference/unionAndIntersectionInference1.types
+++ b/tests/baselines/reference/unionAndIntersectionInference1.types
@@ -98,14 +98,14 @@ var result = destructure(value, text => 'string', y => 'other one'); // text: st
 >                 : ^    ^^^^^^^^^^^^^^^^^^^
 >text : string
 >     : ^^^^^^
->'string' : string
->         : ^^^^^^
+>'string' : "string"
+>         : ^^^^^^^^
 >y => 'other one' : (y: Y) => string
 >                 : ^ ^^^^^^^^^^^^^^
 >y : Y
 >  : ^
->'other one' : string
->            : ^^^^^^
+>'other one' : "other one"
+>            : ^^^^^^^^^^^
 
 // Repro from #4212
 
diff --git a/tests/baselines/reference/unionAndIntersectionInference3.types b/tests/baselines/reference/unionAndIntersectionInference3.types
index cbba9bc9d3d..04e874d0836 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.types
+++ b/tests/baselines/reference/unionAndIntersectionInference3.types
@@ -24,12 +24,12 @@ concatMaybe([1, 2, 3], 4);
 >            : ^ ^^^^^    ^^                         ^^^^^   
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >4 : 4
 >  : ^
 
diff --git a/tests/baselines/reference/unionReductionMutualSubtypes.types b/tests/baselines/reference/unionReductionMutualSubtypes.types
index 8a1f51478c0..6f46e8e1af0 100644
--- a/tests/baselines/reference/unionReductionMutualSubtypes.types
+++ b/tests/baselines/reference/unionReductionMutualSubtypes.types
@@ -54,7 +54,7 @@ function run(options: { something?(b?: string): void }) {
 >              : ^^^^
 >something : (b?: string) => void
 >          : ^ ^^^      ^^^^^    
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/unionReductionWithStringMappingAndIdenticalBaseTypeExistsNoCrash.types b/tests/baselines/reference/unionReductionWithStringMappingAndIdenticalBaseTypeExistsNoCrash.types
index d15ef2c9793..f1b8eb41c4a 100644
--- a/tests/baselines/reference/unionReductionWithStringMappingAndIdenticalBaseTypeExistsNoCrash.types
+++ b/tests/baselines/reference/unionReductionWithStringMappingAndIdenticalBaseTypeExistsNoCrash.types
@@ -214,8 +214,8 @@ function Comp() {
 >                     : ^^^^^^^^^^^^^^^^^^
 >displayEnum : (value: string) => Capitalize<string>
 >            : ^     ^^      ^^^^^^^^^^^^^^^^^^^^^^^
->"VALUE" : string
->        : ^^^^^^
+>"VALUE" : "VALUE"
+>        : ^^^^^^^
 
   </div>
 >div : any
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.types b/tests/baselines/reference/unionThisTypeInFunctions.types
index cdcf21445eb..4eb6ee48e84 100644
--- a/tests/baselines/reference/unionThisTypeInFunctions.types
+++ b/tests/baselines/reference/unionThisTypeInFunctions.types
@@ -42,7 +42,7 @@ function test(r: Real | Fake) {
 >  : ^^^^^^^^^^^
 >method : ((this: Real, n: number) => void) | ((this: Fake, n: number) => void)
 >       : ^^    ^^^^^^^^ ^^      ^^^^^    ^^^^^^    ^^^^^^^^ ^^      ^^^^^    ^
->12 : number
->   : ^^^^^^
+>12 : 12
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures.types b/tests/baselines/reference/unionTypeCallSignatures.types
index d1e5a5aeed0..7663b604002 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.types
+++ b/tests/baselines/reference/unionTypeCallSignatures.types
@@ -32,8 +32,8 @@ numOrDate = unionOfDifferentReturnType(10);
 >                               : ^^^^^^^^^^^^^
 >unionOfDifferentReturnType : ((a: number) => number) | ((a: number) => Date)
 >                           : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 strOrBoolean = unionOfDifferentReturnType("hello"); // error 
 >strOrBoolean = unionOfDifferentReturnType("hello") : number | Date
@@ -44,8 +44,8 @@ strOrBoolean = unionOfDifferentReturnType("hello"); // error
 >                                    : ^^^^^^^^^^^^^
 >unionOfDifferentReturnType : ((a: number) => number) | ((a: number) => Date)
 >                           : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 unionOfDifferentReturnType1(true); // error in type of parameter
 >unionOfDifferentReturnType1(true) : (number | Date) & (string | boolean)
@@ -76,8 +76,8 @@ numOrDate = unionOfDifferentReturnType1(10);
 >                                : ^^^^^^^^^^^^^
 >unionOfDifferentReturnType1 : { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; }
 >                            : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 strOrBoolean = unionOfDifferentReturnType1("hello");
 >strOrBoolean = unionOfDifferentReturnType1("hello") : string | boolean
@@ -88,8 +88,8 @@ strOrBoolean = unionOfDifferentReturnType1("hello");
 >                                     : ^^^^^^^^^^^^^^^^
 >unionOfDifferentReturnType1 : { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; }
 >                            : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 unionOfDifferentReturnType1(true); // error in type of parameter
 >unionOfDifferentReturnType1(true) : (number | Date) & (string | boolean)
@@ -118,16 +118,16 @@ unionOfDifferentParameterTypes(10);// error - no call signatures
 >                                   : ^^^^^^^^^^^^^
 >unionOfDifferentParameterTypes : ((a: number) => number) | ((a: string) => Date)
 >                               : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 unionOfDifferentParameterTypes("hello");// error - no call signatures
 >unionOfDifferentParameterTypes("hello") : number | Date
 >                                        : ^^^^^^^^^^^^^
 >unionOfDifferentParameterTypes : ((a: number) => number) | ((a: string) => Date)
 >                               : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 unionOfDifferentParameterTypes();// error - no call signatures
 >unionOfDifferentParameterTypes() : number | Date
@@ -156,16 +156,16 @@ unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 >                                       : ^^^^^^^^^^^^^
 >unionOfDifferentNumberOfSignatures : ((a: number) => number) | { (a: number): Date; (a: string): boolean; }
 >                                   : ^^ ^^      ^^^^^      ^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 >unionOfDifferentNumberOfSignatures("hello") : number | Date
 >                                            : ^^^^^^^^^^^^^
 >unionOfDifferentNumberOfSignatures : ((a: number) => number) | { (a: number): Date; (a: string): boolean; }
 >                                   : ^^ ^^      ^^^^^      ^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
 >unionWithDifferentParameterCount : ((a: string) => string) | ((a: string, b: number) => number)
@@ -188,18 +188,18 @@ unionWithDifferentParameterCount("hello");// needs more args
 >                                          : ^^^^^^^^^^^^^^^
 >unionWithDifferentParameterCount : ((a: string) => string) | ((a: string, b: number) => number)
 >                                 : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 unionWithDifferentParameterCount("hello", 10);// OK
 >unionWithDifferentParameterCount("hello", 10) : string | number
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithDifferentParameterCount : ((a: string) => string) | ((a: string, b: number) => number)
 >                                 : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->"hello" : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
 >unionWithOptionalParameter1 : ((a: string, b?: number) => string) | ((a: string, b?: number) => number)
@@ -222,8 +222,8 @@ strOrNum = unionWithOptionalParameter1('hello');
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter1 : ((a: string, b?: number) => string) | ((a: string, b?: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithOptionalParameter1('hello', 10);
 >strOrNum = unionWithOptionalParameter1('hello', 10) : string | number
@@ -234,10 +234,10 @@ strOrNum = unionWithOptionalParameter1('hello', 10);
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter1 : ((a: string, b?: number) => string) | ((a: string, b?: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 >strOrNum = unionWithOptionalParameter1('hello', "hello") : string | number
@@ -248,10 +248,10 @@ strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter1 : ((a: string, b?: number) => string) | ((a: string, b?: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithOptionalParameter1(); // error
 >strOrNum = unionWithOptionalParameter1() : string | number
@@ -284,8 +284,8 @@ strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter2 : ((a: string, b?: number) => string) | ((a: string, b: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
 >strOrNum = unionWithOptionalParameter2('hello', 10) : string | number
@@ -296,10 +296,10 @@ strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter2 : ((a: string, b?: number) => string) | ((a: string, b: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signature
 >strOrNum = unionWithOptionalParameter2('hello', "hello") : string | number
@@ -310,10 +310,10 @@ strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signa
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter2 : ((a: string, b?: number) => string) | ((a: string, b: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithOptionalParameter2(); // error no call signature
 >strOrNum = unionWithOptionalParameter2() : string | number
@@ -344,8 +344,8 @@ strOrNum = unionWithOptionalParameter3('hello');
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter3 : ((a: string, b?: number) => string) | ((a: string) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithOptionalParameter3('hello', 10); // ok
 >strOrNum = unionWithOptionalParameter3('hello', 10) : string | number
@@ -356,10 +356,10 @@ strOrNum = unionWithOptionalParameter3('hello', 10); // ok
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter3 : ((a: string, b?: number) => string) | ((a: string) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
 >strOrNum = unionWithOptionalParameter3('hello', "hello") : string | number
@@ -370,10 +370,10 @@ strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter3 : ((a: string, b?: number) => string) | ((a: string) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithOptionalParameter3(); // needs more args
 >strOrNum = unionWithOptionalParameter3() : string | number
@@ -406,8 +406,8 @@ strOrNum = unionWithRestParameter1('hello');
 >                                 : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : ((a: string, ...b: number[]) => string) | ((a: string, ...b: number[]) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter1('hello', 10);
 >strOrNum = unionWithRestParameter1('hello', 10) : string | number
@@ -418,10 +418,10 @@ strOrNum = unionWithRestParameter1('hello', 10);
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : ((a: string, ...b: number[]) => string) | ((a: string, ...b: number[]) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = unionWithRestParameter1('hello', 10, 11);
 >strOrNum = unionWithRestParameter1('hello', 10, 11) : string | number
@@ -432,12 +432,12 @@ strOrNum = unionWithRestParameter1('hello', 10, 11);
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : ((a: string, ...b: number[]) => string) | ((a: string, ...b: number[]) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
->11 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
+>11 : 11
+>   : ^^
 
 strOrNum = unionWithRestParameter1('hello', "hello"); // error in parameter type
 >strOrNum = unionWithRestParameter1('hello', "hello") : string | number
@@ -448,10 +448,10 @@ strOrNum = unionWithRestParameter1('hello', "hello"); // error in parameter type
 >                                          : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : ((a: string, ...b: number[]) => string) | ((a: string, ...b: number[]) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter1(); // error
 >strOrNum = unionWithRestParameter1() : string | number
@@ -484,8 +484,8 @@ strOrNum = unionWithRestParameter2('hello'); // error no call signature
 >                                 : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : ((a: string, ...b: number[]) => string) | ((a: string, b: number) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
 >strOrNum = unionWithRestParameter2('hello', 10) : string | number
@@ -496,10 +496,10 @@ strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : ((a: string, ...b: number[]) => string) | ((a: string, b: number) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
 >strOrNum = unionWithRestParameter2('hello', 10, 11) : string | number
@@ -510,10 +510,10 @@ strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : ((a: string, ...b: number[]) => string) | ((a: string, b: number) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 >11 : 11
 >   : ^^
 
@@ -526,10 +526,10 @@ strOrNum = unionWithRestParameter2('hello', "hello"); // error no call signature
 >                                          : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : ((a: string, ...b: number[]) => string) | ((a: string, b: number) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter2(); // error no call signature
 >strOrNum = unionWithRestParameter2() : string | number
@@ -560,8 +560,8 @@ strOrNum = unionWithRestParameter3('hello');
 >                                 : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : ((a: string, ...b: number[]) => string) | ((a: string) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
 >strOrNum = unionWithRestParameter3('hello', 10) : string | number
@@ -572,10 +572,10 @@ strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : ((a: string, ...b: number[]) => string) | ((a: string) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 >strOrNum = unionWithRestParameter3('hello', 10, 11) : string | number
@@ -586,12 +586,12 @@ strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : ((a: string, ...b: number[]) => string) | ((a: string) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
->11 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
+>11 : 11
+>   : ^^
 
 strOrNum = unionWithRestParameter3('hello', "hello"); // wrong argument type
 >strOrNum = unionWithRestParameter3('hello', "hello") : string | number
@@ -602,10 +602,10 @@ strOrNum = unionWithRestParameter3('hello', "hello"); // wrong argument type
 >                                          : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : ((a: string, ...b: number[]) => string) | ((a: string) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter3(); // error no call signature
 >strOrNum = unionWithRestParameter3() : string | number
@@ -636,8 +636,8 @@ strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not
 >                                 : ^^^^^^^^^^^^^^^
 >unionWithRestParameter4 : ((...a: string[]) => string) | ((a: string, b: string) => number)
 >                        : ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = unionWithRestParameter4("hello", "world");
 >strOrNum = unionWithRestParameter4("hello", "world") : string | number
@@ -648,8 +648,8 @@ strOrNum = unionWithRestParameter4("hello", "world");
 >                                          : ^^^^^^^^^^^^^^^
 >unionWithRestParameter4 : ((...a: string[]) => string) | ((a: string, b: string) => number)
 >                        : ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->"hello" : string
->        : ^^^^^^
->"world" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>"world" : "world"
+>        : ^^^^^^^
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures2.types b/tests/baselines/reference/unionTypeCallSignatures2.types
index bb083803935..620930fc9c1 100644
--- a/tests/baselines/reference/unionTypeCallSignatures2.types
+++ b/tests/baselines/reference/unionTypeCallSignatures2.types
@@ -68,8 +68,8 @@ var n1 = f1(42);             // number
 >       : ^^^^^^
 >f1 : A | B | C
 >   : ^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var s1 = f1("abc");          // boolean | string | number
 >s1 : string | number | boolean
@@ -78,8 +78,8 @@ var s1 = f1("abc");          // boolean | string | number
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f1 : A | B | C
 >   : ^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 var a1 = f1([true, false]);  // boolean[]
 >a1 : boolean[]
@@ -106,8 +106,8 @@ var n2 = f2(42);             // number
 >       : ^^^^^^
 >f2 : A | B | C
 >   : ^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var s2 = f2("abc");          // number | string | boolean
 >s2 : string | number | boolean
@@ -116,8 +116,8 @@ var s2 = f2("abc");          // number | string | boolean
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f2 : A | B | C
 >   : ^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 var a2 = f2([true, false]);  // boolean[]
 >a2 : boolean[]
@@ -144,8 +144,8 @@ var n3 = f3(42);             // number
 >       : ^^^^^^
 >f3 : A | B | C
 >   : ^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 var s3 = f3("abc");          // string | boolean | number
 >s3 : string | number | boolean
@@ -154,8 +154,8 @@ var s3 = f3("abc");          // string | boolean | number
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f3 : A | B | C
 >   : ^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 var a3 = f3([true, false]);  // boolean[]
 >a3 : boolean[]
diff --git a/tests/baselines/reference/unionTypeCallSignatures3.types b/tests/baselines/reference/unionTypeCallSignatures3.types
index ea1420f9498..217f57b0b9a 100644
--- a/tests/baselines/reference/unionTypeCallSignatures3.types
+++ b/tests/baselines/reference/unionTypeCallSignatures3.types
@@ -74,6 +74,6 @@ fUnion(""); // All constituents can be called by passing a single string.
 >           : ^^^^
 >fUnion : ((s: string) => void) | ((s?: string) => void) | ((...s: string[]) => void) | ((s: string, s2?: string) => void) | ((s?: string, n?: number) => void) | ((s?: string, ...n: number[]) => void) | ((s: string, ...sRest: string[]) => void)
 >       : ^^ ^^      ^^^^^^^^^^^^^^^ ^^^      ^^^^^^^^^^^^^^^^^^ ^^        ^^^^^^^^^^^^^^^ ^^      ^^  ^^^      ^^^^^^^^^^^^^^^ ^^^      ^^ ^^^      ^^^^^^^^^^^^^^^ ^^^      ^^^^^ ^^        ^^^^^^^^^^^^^^^ ^^      ^^^^^     ^^        ^^^^^^^^^^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.types b/tests/baselines/reference/unionTypeCallSignatures4.types
index 8f61f728f66..84058d75f95 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.types
+++ b/tests/baselines/reference/unionTypeCallSignatures4.types
@@ -54,30 +54,30 @@ f12("a");
 >         : ^^^^
 >f12 : F1 | F2
 >    : ^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 f12("a", "b");
 >f12("a", "b") : void
 >              : ^^^^
 >f12 : F1 | F2
 >    : ^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 f12("a", "b", "c");  // ok
 >f12("a", "b", "c") : void
 >                   : ^^^^
 >f12 : F1 | F2
 >    : ^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
 
 var f34: F3 | F4;
 >f34 : F3 | F4
@@ -88,30 +88,30 @@ f34("a");
 >         : ^^^^
 >f34 : F3 | F4
 >    : ^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 f34("a", "b");
 >f34("a", "b") : void
 >              : ^^^^
 >f34 : F3 | F4
 >    : ^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 f34("a", "b", "c");
 >f34("a", "b", "c") : void
 >                   : ^^^^
 >f34 : F3 | F4
 >    : ^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
 
 var f1234: F1 | F2 | F3 | F4;
 >f1234 : F1 | F2 | F3 | F4
@@ -122,30 +122,30 @@ f1234("a");
 >           : ^^^^
 >f1234 : F1 | F2 | F3 | F4
 >      : ^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 f1234("a", "b");
 >f1234("a", "b") : void
 >                : ^^^^
 >f1234 : F1 | F2 | F3 | F4
 >      : ^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 f1234("a", "b", "c");  // ok
 >f1234("a", "b", "c") : void
 >                     : ^^^^
 >f1234 : F1 | F2 | F3 | F4
 >      : ^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
->"c" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
 
 var f12345: F1 | F2 | F3 | F4 | F5;
 >f12345 : F1 | F2 | F3 | F4 | F5
@@ -156,28 +156,28 @@ f12345("a");  // error
 >            : ^^^^
 >f12345 : F1 | F2 | F3 | F4 | F5
 >       : ^^^^^^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 f12345("a", "b");
 >f12345("a", "b") : void
 >                 : ^^^^
 >f12345 : F1 | F2 | F3 | F4 | F5
 >       : ^^^^^^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 
 f12345("a", "b", "c");  // error
 >f12345("a", "b", "c") : void
 >                      : ^^^^
 >f12345 : F1 | F2 | F3 | F4 | F5
 >       : ^^^^^^^^^^^^^^^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
 >"c" : "c"
 >    : ^^^
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures5.types b/tests/baselines/reference/unionTypeCallSignatures5.types
index e3b61e6e882..2caee632f1c 100644
--- a/tests/baselines/reference/unionTypeCallSignatures5.types
+++ b/tests/baselines/reference/unionTypeCallSignatures5.types
@@ -30,6 +30,6 @@ fn(0);
 >      : ^^^^
 >fn : A | B | C
 >   : ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures7.types b/tests/baselines/reference/unionTypeCallSignatures7.types
index 2200af3a159..e3f29e99056 100644
--- a/tests/baselines/reference/unionTypeCallSignatures7.types
+++ b/tests/baselines/reference/unionTypeCallSignatures7.types
@@ -21,6 +21,6 @@ const result = f(123);
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >f : Callable<"A"> | Callable<"B">
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
diff --git a/tests/baselines/reference/unionTypeConstructSignatures.types b/tests/baselines/reference/unionTypeConstructSignatures.types
index cd7eb80c4d8..7876baf6bc8 100644
--- a/tests/baselines/reference/unionTypeConstructSignatures.types
+++ b/tests/baselines/reference/unionTypeConstructSignatures.types
@@ -32,8 +32,8 @@ numOrDate = new unionOfDifferentReturnType(10);
 >                                   : ^^^^^^^^^^^^^
 >unionOfDifferentReturnType : (new (a: number) => number) | (new (a: number) => Date)
 >                           : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 strOrBoolean = new unionOfDifferentReturnType("hello"); // error
 >strOrBoolean = new unionOfDifferentReturnType("hello") : number | Date
@@ -44,8 +44,8 @@ strOrBoolean = new unionOfDifferentReturnType("hello"); // error
 >                                        : ^^^^^^^^^^^^^
 >unionOfDifferentReturnType : (new (a: number) => number) | (new (a: number) => Date)
 >                           : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 new unionOfDifferentReturnType1(true); // error in type of parameter
 >new unionOfDifferentReturnType1(true) : (number | Date) & (string | boolean)
@@ -76,8 +76,8 @@ numOrDate = new unionOfDifferentReturnType1(10);
 >                                    : ^^^^^^^^^^^^^
 >unionOfDifferentReturnType1 : { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; }
 >                            : ^^^^^^^ ^^      ^^^      ^^^^^^^ ^^      ^^^      ^^^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 strOrBoolean = new unionOfDifferentReturnType1("hello");
 >strOrBoolean = new unionOfDifferentReturnType1("hello") : string | boolean
@@ -88,8 +88,8 @@ strOrBoolean = new unionOfDifferentReturnType1("hello");
 >                                         : ^^^^^^^^^^^^^^^^
 >unionOfDifferentReturnType1 : { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; }
 >                            : ^^^^^^^ ^^      ^^^      ^^^^^^^ ^^      ^^^      ^^^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 new unionOfDifferentReturnType1(true); // error in type of parameter
 >new unionOfDifferentReturnType1(true) : (number | Date) & (string | boolean)
@@ -118,16 +118,16 @@ new unionOfDifferentParameterTypes(10);// error - no call signatures
 >                                       : ^^^^^^^^^^^^^
 >unionOfDifferentParameterTypes : (new (a: number) => number) | (new (a: string) => Date)
 >                               : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 new unionOfDifferentParameterTypes("hello");// error - no call signatures
 >new unionOfDifferentParameterTypes("hello") : number | Date
 >                                            : ^^^^^^^^^^^^^
 >unionOfDifferentParameterTypes : (new (a: number) => number) | (new (a: string) => Date)
 >                               : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 new unionOfDifferentParameterTypes();// error - no call signatures
 >new unionOfDifferentParameterTypes() : number | Date
@@ -156,16 +156,16 @@ new unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 >                                           : ^^^^^^^^^^^^^
 >unionOfDifferentNumberOfSignatures : (new (a: number) => number) | { new (a: number): Date; new (a: string): boolean; }
 >                                   : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 
 new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 >new unionOfDifferentNumberOfSignatures("hello") : number | Date
 >                                                : ^^^^^^^^^^^^^
 >unionOfDifferentNumberOfSignatures : (new (a: number) => number) | { new (a: number): Date; new (a: string): boolean; }
 >                                   : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
 >unionWithDifferentParameterCount : (new (a: string) => string) | (new (a: string, b: number) => number)
@@ -188,18 +188,18 @@ new unionWithDifferentParameterCount("hello");// needs more args
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithDifferentParameterCount : (new (a: string) => string) | (new (a: string, b: number) => number)
 >                                 : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 new unionWithDifferentParameterCount("hello", 10);// ok
 >new unionWithDifferentParameterCount("hello", 10) : string | number
 >                                                  : ^^^^^^^^^^^^^^^
 >unionWithDifferentParameterCount : (new (a: string) => string) | (new (a: string, b: number) => number)
 >                                 : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->"hello" : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
 >unionWithOptionalParameter1 : (new (a: string, b?: number) => string) | (new (a: string, b?: number) => number)
@@ -222,8 +222,8 @@ strOrNum = new unionWithOptionalParameter1('hello');
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter1 : (new (a: string, b?: number) => string) | (new (a: string, b?: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithOptionalParameter1('hello', 10);
 >strOrNum = new unionWithOptionalParameter1('hello', 10) : string | number
@@ -234,10 +234,10 @@ strOrNum = new unionWithOptionalParameter1('hello', 10);
 >                                             : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter1 : (new (a: string, b?: number) => string) | (new (a: string, b?: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 >strOrNum = new unionWithOptionalParameter1('hello', "hello") : string | number
@@ -248,10 +248,10 @@ strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parame
 >                                                  : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter1 : (new (a: string, b?: number) => string) | (new (a: string, b?: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithOptionalParameter1(); // error
 >strOrNum = new unionWithOptionalParameter1() : string | number
@@ -284,8 +284,8 @@ strOrNum = new unionWithOptionalParameter2('hello'); // error no call signature
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter2 : (new (a: string, b?: number) => string) | (new (a: string, b: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signature
 >strOrNum = new unionWithOptionalParameter2('hello', 10) : string | number
@@ -296,10 +296,10 @@ strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signat
 >                                             : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter2 : (new (a: string, b?: number) => string) | (new (a: string, b: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call signature
 >strOrNum = new unionWithOptionalParameter2('hello', "hello") : string | number
@@ -310,10 +310,10 @@ strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call s
 >                                                  : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter2 : (new (a: string, b?: number) => string) | (new (a: string, b: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithOptionalParameter2(); // error no call signature
 >strOrNum = new unionWithOptionalParameter2() : string | number
@@ -344,8 +344,8 @@ strOrNum = new unionWithOptionalParameter3('hello'); // error no call signature
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter3 : (new (a: string, b?: number) => string) | (new (a: string) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
 >strOrNum = new unionWithOptionalParameter3('hello', 10) : string | number
@@ -356,10 +356,10 @@ strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
 >                                             : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter3 : (new (a: string, b?: number) => string) | (new (a: string) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
 >strOrNum = new unionWithOptionalParameter3('hello', "hello") : string | number
@@ -370,10 +370,10 @@ strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
 >                                                  : ^^^^^^^^^^^^^^^
 >unionWithOptionalParameter3 : (new (a: string, b?: number) => string) | (new (a: string) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithOptionalParameter3(); // error no call signature
 >strOrNum = new unionWithOptionalParameter3() : string | number
@@ -406,8 +406,8 @@ strOrNum = new unionWithRestParameter1('hello');
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : (new (a: string, ...b: number[]) => string) | (new (a: string, ...b: number[]) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithRestParameter1('hello', 10);
 >strOrNum = new unionWithRestParameter1('hello', 10) : string | number
@@ -418,10 +418,10 @@ strOrNum = new unionWithRestParameter1('hello', 10);
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : (new (a: string, ...b: number[]) => string) | (new (a: string, ...b: number[]) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = new unionWithRestParameter1('hello', 10, 11);
 >strOrNum = new unionWithRestParameter1('hello', 10, 11) : string | number
@@ -432,12 +432,12 @@ strOrNum = new unionWithRestParameter1('hello', 10, 11);
 >                                             : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : (new (a: string, ...b: number[]) => string) | (new (a: string, ...b: number[]) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
->11 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
+>11 : 11
+>   : ^^
 
 strOrNum = new unionWithRestParameter1('hello', "hello"); // error in parameter type
 >strOrNum = new unionWithRestParameter1('hello', "hello") : string | number
@@ -448,10 +448,10 @@ strOrNum = new unionWithRestParameter1('hello', "hello"); // error in parameter
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithRestParameter1 : (new (a: string, ...b: number[]) => string) | (new (a: string, ...b: number[]) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithRestParameter1(); // error
 >strOrNum = new unionWithRestParameter1() : string | number
@@ -484,8 +484,8 @@ strOrNum = new unionWithRestParameter2('hello'); // error no call signature
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : (new (a: string, ...b: number[]) => string) | (new (a: string, b: number) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
 >strOrNum = new unionWithRestParameter2('hello', 10) : string | number
@@ -496,10 +496,10 @@ strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : (new (a: string, ...b: number[]) => string) | (new (a: string, b: number) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signature
 >strOrNum = new unionWithRestParameter2('hello', 10, 11) : string | number
@@ -510,10 +510,10 @@ strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signat
 >                                             : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : (new (a: string, ...b: number[]) => string) | (new (a: string, b: number) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 >11 : 11
 >   : ^^
 
@@ -526,10 +526,10 @@ strOrNum = new unionWithRestParameter2('hello', "hello"); // error no call signa
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithRestParameter2 : (new (a: string, ...b: number[]) => string) | (new (a: string, b: number) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithRestParameter2(); // error no call signature
 >strOrNum = new unionWithRestParameter2() : string | number
@@ -560,8 +560,8 @@ strOrNum = new unionWithRestParameter3('hello'); // error no call signature
 >                                     : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : (new (a: string, ...b: number[]) => string) | (new (a: string) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithRestParameter3('hello', 10); // ok
 >strOrNum = new unionWithRestParameter3('hello', 10) : string | number
@@ -572,10 +572,10 @@ strOrNum = new unionWithRestParameter3('hello', 10); // ok
 >                                         : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : (new (a: string, ...b: number[]) => string) | (new (a: string) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
 
 strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
 >strOrNum = new unionWithRestParameter3('hello', 10, 11) : string | number
@@ -586,12 +586,12 @@ strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
 >                                             : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : (new (a: string, ...b: number[]) => string) | (new (a: string) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->10 : number
->   : ^^^^^^
->11 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>10 : 10
+>   : ^^
+>11 : 11
+>   : ^^
 
 strOrNum = new unionWithRestParameter3('hello', "hello"); // wrong type
 >strOrNum = new unionWithRestParameter3('hello', "hello") : string | number
@@ -602,10 +602,10 @@ strOrNum = new unionWithRestParameter3('hello', "hello"); // wrong type
 >                                              : ^^^^^^^^^^^^^^^
 >unionWithRestParameter3 : (new (a: string, ...b: number[]) => string) | (new (a: string) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
->'hello' : string
->        : ^^^^^^
->"hello" : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 strOrNum = new unionWithRestParameter3(); // error no call signature
 >strOrNum = new unionWithRestParameter3() : string | number
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.types b/tests/baselines/reference/unionTypeFromArrayLiteral.types
index 3d4ecbf08f7..3678810494f 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.types
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.types
@@ -31,20 +31,20 @@ var arr3Tuple: [number, string] = [3, "three"]; // [number, string]
 >          : ^^^^^^^^^^^^^^^^
 >[3, "three"] : [number, string]
 >             : ^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->"three" : string
->        : ^^^^^^
+>3 : 3
+>  : ^
+>"three" : "three"
+>        : ^^^^^^^
 
 var arr4Tuple: [number, string] = [3, "three", "hello"]; // [number, string, string]
 >arr4Tuple : [number, string]
 >          : ^^^^^^^^^^^^^^^^
 >[3, "three", "hello"] : [number, string, string]
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->"three" : string
->        : ^^^^^^
+>3 : 3
+>  : ^
+>"three" : "three"
+>        : ^^^^^^^
 >"hello" : "hello"
 >        : ^^^^^^^
 
@@ -69,8 +69,8 @@ var arr5Tuple: {
 } = ["hello", true, false, " hello", true, 10, "any"]; // Tuple
 >["hello", true, false, " hello", true, 10, "any"] : [string, boolean, boolean, string, boolean, number, string]
 >                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
 >false : false
@@ -79,8 +79,8 @@ var arr5Tuple: {
 >         : ^^^^^^^^
 >true : true
 >     : ^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >"any" : "any"
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index 38424a9436a..b6a3d7f113f 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -52,8 +52,8 @@ const a3 = f1(1, sn);  // number
 >          : ^^^^^^
 >f1 : <T>(x: T, y: string | T) => T
 >   : ^ ^^ ^^ ^^ ^^          ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >sn : string | number
 >   : ^^^^^^^^^^^^^^^
 
@@ -66,8 +66,8 @@ const a4 = f1(undefined, "abc");  // undefined
 >   : ^ ^^ ^^ ^^ ^^          ^^^^^ 
 >undefined : undefined
 >          : ^^^^^^^^^
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 const a5 = f1("foo", "bar");  // "foo"
 >a5 : "foo"
@@ -78,8 +78,8 @@ const a5 = f1("foo", "bar");  // "foo"
 >   : ^ ^^ ^^ ^^ ^^          ^^^^^ 
 >"foo" : "foo"
 >      : ^^^^^
->"bar" : string
->      : ^^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
 const a6 = f1(true, false);  // boolean
 >a6 : boolean
@@ -102,8 +102,8 @@ const a7 = f1("hello", 1);  // Error
 >   : ^ ^^ ^^ ^^ ^^          ^^^^^ 
 >"hello" : "hello"
 >        : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 declare function f2<T>(value: [string, T]): T;
 >f2 : <T>(value: [string, T]) => T
@@ -120,8 +120,8 @@ var b1 = f2(["string", true]);  // boolean
 >   : ^ ^^     ^^           ^^^^^ 
 >["string", true] : [string, true]
 >                 : ^^^^^^^^^^^^^^
->"string" : string
->         : ^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 >true : true
 >     : ^^^^
 
@@ -216,8 +216,8 @@ const d3 = f4(42);  // Error
 >       : ^^
 >f4 : <T>(x: string & T) => T
 >   : ^ ^^ ^^          ^^^^^ 
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 export interface Foo<T> {
     then<U>(f: (x: T) => U | Foo<U>, g: U): Foo<U>;
diff --git a/tests/baselines/reference/unionTypeReduction2.types b/tests/baselines/reference/unionTypeReduction2.types
index d4f1861e4af..b8a7e348cdd 100644
--- a/tests/baselines/reference/unionTypeReduction2.types
+++ b/tests/baselines/reference/unionTypeReduction2.types
@@ -50,8 +50,8 @@ function f1(x: { f(): void }, y: { f(x?: string): void }) {
 >  : ^^^^ ^^^      ^^^    ^^^
 >f : (x?: string) => void
 >  : ^ ^^^      ^^^^^    
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 }
 
 function f2(x: { f(x: string | undefined): void }, y: { f(x?: string): void }) {
@@ -105,8 +105,8 @@ function f2(x: { f(x: string | undefined): void }, y: { f(x?: string): void }) {
 >  : ^^^^ ^^^      ^^^    ^^^
 >f : (x?: string) => void
 >  : ^ ^^^      ^^^^^    
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 }
 
 function f3(x: () => void, y: (x?: string) => void) {
@@ -146,8 +146,8 @@ function f3(x: () => void, y: (x?: string) => void) {
 >           : ^^^^
 >f : (x?: string) => void
 >  : ^ ^^^      ^^^^^    
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 }
 
 function f4(x: (x: string | undefined) => void, y: (x?: string) => void) {
@@ -189,8 +189,8 @@ function f4(x: (x: string | undefined) => void, y: (x?: string) => void) {
 >           : ^^^^
 >f : (x?: string) => void
 >  : ^ ^^^      ^^^^^    
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 }
 
 function f5(x: (x: string | undefined) => void, y: (x?: 'hello') => void) {
@@ -346,8 +346,8 @@ function f11(a: A, b: B) {
 >  : ^^^^^
 >f : ((x?: string) => void) | (() => void)
 >  : ^^ ^^^      ^^^^^    ^^^^^^^^^^^    ^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 }
 
 // Repro from #35414
@@ -403,7 +403,7 @@ function run(options: { something?(b?: string): void }) {
 >              : ^^^^
 >something : (b?: string) => void
 >          : ^ ^^^      ^^^^^    
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 }
 
diff --git a/tests/baselines/reference/unionTypeWithIndexSignature.types b/tests/baselines/reference/unionTypeWithIndexSignature.types
index 0d14d819f20..e833eb71037 100644
--- a/tests/baselines/reference/unionTypeWithIndexSignature.types
+++ b/tests/baselines/reference/unionTypeWithIndexSignature.types
@@ -146,28 +146,28 @@ declare var num: Num
 >    : ^^^
 
 num[0] = 1
->num[0] = 1 : number
->           : ^^^^^^
+>num[0] = 1 : 1
+>           : ^
 >num[0] : string | number
 >       : ^^^^^^^^^^^^^^^
 >num : Num
 >    : ^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 num['0'] = 'ok'
->num['0'] = 'ok' : string
->                : ^^^^^^
+>num['0'] = 'ok' : "ok"
+>                : ^^^^
 >num['0'] : string | number
 >         : ^^^^^^^^^^^^^^^
 >num : Num
 >    : ^^^
 >'0' : "0"
 >    : ^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 
 const sym = Symbol()
 >sym : unique symbol
@@ -198,28 +198,28 @@ declare var both: Both
 >     : ^^^^
 
 both['s'] = 'ok'
->both['s'] = 'ok' : string
->                 : ^^^^^^
+>both['s'] = 'ok' : "ok"
+>                 : ^^^^
 >both['s'] : string | number
 >          : ^^^^^^^^^^^^^^^
 >both : Both
 >     : ^^^^
 >'s' : "s"
 >    : ^^^
->'ok' : string
->     : ^^^^^^
+>'ok' : "ok"
+>     : ^^^^
 
 both[0] = 1
->both[0] = 1 : number
->            : ^^^^^^
+>both[0] = 1 : 1
+>            : ^
 >both[0] : number
 >        : ^^^^^^
 >both : Both
 >     : ^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 both[1] = 0 // not ok
 >both[1] = 0 : 0
@@ -234,16 +234,16 @@ both[1] = 0 // not ok
 >  : ^
 
 both[0] = 'not ok'
->both[0] = 'not ok' : string
->                   : ^^^^^^
+>both[0] = 'not ok' : "not ok"
+>                   : ^^^^^^^^
 >both[0] : number
 >        : ^^^^^^
 >both : Both
 >     : ^^^^
 >0 : 0
 >  : ^
->'not ok' : string
->         : ^^^^^^
+>'not ok' : "not ok"
+>         : ^^^^^^^^
 
 both[sym] = 'not ok'
 >both[sym] = 'not ok' : "not ok"
diff --git a/tests/baselines/reference/unionsOfTupleTypes1.types b/tests/baselines/reference/unionsOfTupleTypes1.types
index acb9daf3628..3f01383d798 100644
--- a/tests/baselines/reference/unionsOfTupleTypes1.types
+++ b/tests/baselines/reference/unionsOfTupleTypes1.types
@@ -352,52 +352,52 @@ function f1(t1: T1, t2: T2, t3: T3, t4: T4, x: number) {
 >  : ^^^^^^
 
     t1[1] = 42;
->t1[1] = 42 : number
->           : ^^^^^^
+>t1[1] = 42 : 42
+>           : ^^
 >t1[1] : number
 >      : ^^^^^^
 >t1 : T1
 >   : ^^
 >1 : 1
 >  : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     t2[1] = 42;
->t2[1] = 42 : number
->           : ^^^^^^
+>t2[1] = 42 : 42
+>           : ^^
 >t2[1] : number | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >t2 : T2
 >   : ^^
 >1 : 1
 >  : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     t3[1] = 42;
->t3[1] = 42 : number
->           : ^^^^^^
+>t3[1] = 42 : 42
+>           : ^^
 >t3[1] : number
 >      : ^^^^^^
 >t3 : T3
 >   : ^^
 >1 : 1
 >  : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
     t4[1] = 42;
->t4[1] = 42 : number
->           : ^^^^^^
+>t4[1] = 42 : 42
+>           : ^^
 >t4[1] : number | undefined
 >      : ^^^^^^^^^^^^^^^^^^
 >t4 : T4
 >   : ^^
 >1 : 1
 >  : ^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 }
 
 // Repro from #27543
@@ -413,8 +413,8 @@ const ex: Unioned = ["hi"] as Unioned;
 >                  : ^^^^^^^
 >["hi"] : [string]
 >       : ^^^^^^^^
->"hi" : string
->     : ^^^^^^
+>"hi" : "hi"
+>     : ^^^^
 
 const [x, y] = ex;
 >x : string
diff --git a/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types b/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types
index bd00e03e6ea..c753a966170 100644
--- a/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types
+++ b/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types
@@ -9,8 +9,8 @@ export const SYM = Symbol('a unique symbol');
 >                          : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'a unique symbol' : string
->                  : ^^^^^^
+>'a unique symbol' : "a unique symbol"
+>                  : ^^^^^^^^^^^^^^^^^
 
 export interface I {
   [SYM]: 'sym';
diff --git a/tests/baselines/reference/uniqueSymbolAssignmentOnGlobalAugmentationSuceeds.types b/tests/baselines/reference/uniqueSymbolAssignmentOnGlobalAugmentationSuceeds.types
index db4a7b8fba5..ad49bb2971c 100644
--- a/tests/baselines/reference/uniqueSymbolAssignmentOnGlobalAugmentationSuceeds.types
+++ b/tests/baselines/reference/uniqueSymbolAssignmentOnGlobalAugmentationSuceeds.types
@@ -8,8 +8,8 @@ const FOO_SYMBOL = Symbol('Foo');
 >              : ^^^^^^^^^^^^^
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
->'Foo' : string
->      : ^^^^^^
+>'Foo' : "Foo"
+>      : ^^^^^
 
 declare global {
 >global : any
@@ -31,14 +31,14 @@ export function foo<T>(p: Promise<T>) {
 >  : ^^^^^^^^^^
 
     p[FOO_SYMBOL] = 3;
->p[FOO_SYMBOL] = 3 : number
->                  : ^^^^^^
+>p[FOO_SYMBOL] = 3 : 3
+>                  : ^
 >p[FOO_SYMBOL] : number | undefined
 >              : ^^^^^^^^^^^^^^^^^^
 >p : Promise<T>
 >  : ^^^^^^^^^^
 >FOO_SYMBOL : unique symbol
 >           : ^^^^^^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 }
diff --git a/tests/baselines/reference/uniqueSymbolsPropertyNames.types b/tests/baselines/reference/uniqueSymbolsPropertyNames.types
index 07672dcb2db..50488b83340 100644
--- a/tests/baselines/reference/uniqueSymbolsPropertyNames.types
+++ b/tests/baselines/reference/uniqueSymbolsPropertyNames.types
@@ -27,8 +27,8 @@ const uniqueSymbol0 = Symbol.for("");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 const uniqueSymbol1 = Symbol.for("");
 >uniqueSymbol1 : unique symbol
@@ -41,8 +41,8 @@ const uniqueSymbol1 = Symbol.for("");
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 
 function getUniqueSymbol0(): typeof uniqueSymbol0 {
@@ -86,8 +86,8 @@ const Op: OpTypes = {
 >       : ^^^^^^^^^^^^^^^^^
 >for : (key: string) => symbol
 >    : ^   ^^      ^^^^^      
->"equal" : string
->        : ^^^^^^
+>"equal" : "equal"
+>        : ^^^^^^^
 
 } as OpTypes;
 
diff --git a/tests/baselines/reference/unknownControlFlow.types b/tests/baselines/reference/unknownControlFlow.types
index c5874c4bd77..2c84aa0d19d 100644
--- a/tests/baselines/reference/unknownControlFlow.types
+++ b/tests/baselines/reference/unknownControlFlow.types
@@ -1126,16 +1126,16 @@ ff1(null, 'foo');  // Error
 >                 : ^^^^
 >ff1 : <T>(t: T, k: keyof T) => void
 >    : ^ ^^ ^^ ^^ ^^       ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 ff2(null, 'foo');  // Error
 >ff2(null, 'foo') : void
 >                 : ^^^^
 >ff2 : <T>(t: T & {}, k: keyof T) => void
 >    : ^ ^^ ^^      ^^ ^^       ^^^^^^^^^
->'foo' : string
->      : ^^^^^^
+>'foo' : "foo"
+>      : ^^^^^
 
 ff3(null, 'foo');
 >ff3(null, 'foo') : void
@@ -1396,8 +1396,8 @@ function SendBlob(encoding: unknown) {
 >                      : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'encoding' : string
->           : ^^^^^^
+>'encoding' : "encoding"
+>           : ^^^^^^^^^^
     }
     encoding;
 >encoding : "utf8" | undefined
@@ -1436,8 +1436,8 @@ function doSomething1<T extends unknown>(value: T): T {
 >                               : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Meaning of life value' : string
->                        : ^^^^^^
+>'Meaning of life value' : "Meaning of life value"
+>                        : ^^^^^^^^^^^^^^^^^^^^^^^
     }
     return value;
 >value : T & ({} | null)
@@ -1568,8 +1568,8 @@ function assertNever(v: never): never {
 >                   : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'never' : string
->        : ^^^^^^
+>'never' : "never"
+>        : ^^^^^^^
 }
 
 function fx20(value: Either) {
diff --git a/tests/baselines/reference/unknownLikeUnionObjectFlagsNotPropagated.types b/tests/baselines/reference/unknownLikeUnionObjectFlagsNotPropagated.types
index 244775192e9..d039ec69b22 100644
--- a/tests/baselines/reference/unknownLikeUnionObjectFlagsNotPropagated.types
+++ b/tests/baselines/reference/unknownLikeUnionObjectFlagsNotPropagated.types
@@ -42,10 +42,10 @@ async function myUnusedFunction() {
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
 >['hello', 'world'] : string[]
 >                   : ^^^^^^^^
->'hello' : string
->        : ^^^^^^
->'world' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>'world' : "world"
+>        : ^^^^^^^
 
     const [data1] = await Promise.all([fetch1]);
 >data1 : string[]
diff --git a/tests/baselines/reference/unknownType1.types b/tests/baselines/reference/unknownType1.types
index fad7a4de8c8..46be92d81bc 100644
--- a/tests/baselines/reference/unknownType1.types
+++ b/tests/baselines/reference/unknownType1.types
@@ -358,20 +358,20 @@ function f21<T>(pAny: any, pNever: never, pT: T) {
 >  : ^^^^^^^
 
     x = 123;
->x = 123 : number
->        : ^^^^^^
+>x = 123 : 123
+>        : ^^^
 >x : unknown
 >  : ^^^^^^^
->123 : number
->    : ^^^^^^
+>123 : 123
+>    : ^^^
 
     x = "hello";
->x = "hello" : string
->            : ^^^^^^
+>x = "hello" : "hello"
+>            : ^^^^^^^
 >x : unknown
 >  : ^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
     x = [1, 2, 3];
 >x = [1, 2, 3] : number[]
@@ -523,8 +523,8 @@ function f24(x: { [x: string]: unknown }) {
 >         : ^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
     x = [1, 2, 3]; // Error
 >x = [1, 2, 3] : number[]
@@ -533,12 +533,12 @@ function f24(x: { [x: string]: unknown }) {
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >[1, 2, 3] : number[]
 >          : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
     x = 123;  // Error
 >x = 123 : 123
diff --git a/tests/baselines/reference/unknownType2.types b/tests/baselines/reference/unknownType2.types
index cd4e2c1fd22..a749e25e0ba 100644
--- a/tests/baselines/reference/unknownType2.types
+++ b/tests/baselines/reference/unknownType2.types
@@ -84,8 +84,8 @@ if (u === 5) {
 >  : ^
 >toString : (radix?: number) => string
 >         : ^     ^^^      ^^^^^      
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 }
 
 if (u === true || u === false) {
@@ -874,8 +874,8 @@ function switchResponse(x: unknown): SomeResponse {
 >                              : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'unknown response' : string
->                   : ^^^^^^
+>'unknown response' : "unknown response"
+>                   : ^^^^^^^^^^^^^^^^^^
     }
     // Arguably this should be never.
     type End = isTrue<isUnknown<typeof x>>
@@ -917,8 +917,8 @@ function switchResponseWrong(x: unknown): SomeResponse {
 >                                          : ^^^^^
 >Error : ErrorConstructor
 >      : ^^^^^^^^^^^^^^^^
->'Can you repeat the question?' : string
->                               : ^^^^^^
+>'Can you repeat the question?' : "Can you repeat the question?"
+>                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
     // Arguably this should be never.
     type End = isTrue<isUnknown<typeof x>>
diff --git a/tests/baselines/reference/unreachableSwitchTypeofAny.types b/tests/baselines/reference/unreachableSwitchTypeofAny.types
index 48507d4205b..59fe1d81232 100644
--- a/tests/baselines/reference/unreachableSwitchTypeofAny.types
+++ b/tests/baselines/reference/unreachableSwitchTypeofAny.types
@@ -18,50 +18,50 @@ const unreachable = (x: any): number => {
         case 'string': return 0
 >'string' : "string"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'number': return 0
 >'number' : "number"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'bigint': return 0
 >'bigint' : "bigint"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'boolean': return 0
 >'boolean' : "boolean"
 >          : ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'symbol': return 0
 >'symbol' : "symbol"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'undefined': return 0
 >'undefined' : "undefined"
 >            : ^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'object': return 0
 >'object' : "object"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'function': return 0
 >'function' : "function"
 >           : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
     x;
 >x : any
diff --git a/tests/baselines/reference/unreachableSwitchTypeofUnknown.types b/tests/baselines/reference/unreachableSwitchTypeofUnknown.types
index 2695007e11a..50144b00009 100644
--- a/tests/baselines/reference/unreachableSwitchTypeofUnknown.types
+++ b/tests/baselines/reference/unreachableSwitchTypeofUnknown.types
@@ -18,50 +18,50 @@ const unreachable = (x: unknown): number => {
         case 'string': return 0
 >'string' : "string"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'number': return 0
 >'number' : "number"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'bigint': return 0
 >'bigint' : "bigint"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'boolean': return 0
 >'boolean' : "boolean"
 >          : ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'symbol': return 0
 >'symbol' : "symbol"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'undefined': return 0
 >'undefined' : "undefined"
 >            : ^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'object': return 0
 >'object' : "object"
 >         : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
         case 'function': return 0
 >'function' : "function"
 >           : ^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
     x;
 >x : unknown
diff --git a/tests/baselines/reference/unspecializedConstraints.types b/tests/baselines/reference/unspecializedConstraints.types
index 68cbf556434..7c1de3b0d21 100644
--- a/tests/baselines/reference/unspecializedConstraints.types
+++ b/tests/baselines/reference/unspecializedConstraints.types
@@ -294,8 +294,8 @@ module ts {
 >                 : ^^^^^^      
 
             return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
         getSignature(index: number): Signature {
 >getSignature : (index: number) => Signature
@@ -312,8 +312,8 @@ module ts {
 >                  : ^^^^^^      
 
             return 0;
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
         }
         getSignatures(): Signature[] {
 >getSignatures : () => Signature[]
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
index 855a0683396..b8e4050c102 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
@@ -131,8 +131,8 @@ c4<number>(1);
 >              : ^^^^^^
 >c4 : callable2<number>
 >   : ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 interface callable3<T> {
     (a: T): T;
@@ -149,7 +149,7 @@ c5<string>(1); // error
 >              : ^^^^^^
 >c5 : callable3<number>
 >   : ^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 
diff --git a/tests/baselines/reference/unusedIdentifiersConsolidated1.types b/tests/baselines/reference/unusedIdentifiersConsolidated1.types
index 1ba323a3180..09ceab897ff 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.types
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.types
@@ -45,16 +45,16 @@ class Dummy<usedtypeparameter, unusedtypeparameter> {
 >   : ^^
 
         this.greeting = "Dummy Message";
->this.greeting = "Dummy Message" : string
->                                : ^^^^^^
+>this.greeting = "Dummy Message" : "Dummy Message"
+>                                : ^^^^^^^^^^^^^^^
 >this.greeting : string
 >              : ^^^^^^
 >this : this
 >     : ^^^^
 >greeting : string
 >         : ^^^^^^
->"Dummy Message" : string
->                : ^^^^^^
+>"Dummy Message" : "Dummy Message"
+>                : ^^^^^^^^^^^^^^^
     }
 
     public greeter(person: string) {
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index f0ad5c095ef..b8083089451 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -14,8 +14,8 @@ var thingy: B = {
     me: "A"
 >me : string
 >   : ^^^^^^
->"A" : string
->    : ^^^^^^
+>"A" : "A"
+>    : ^^^
 
 };
 declare function foo(a: string): void;
diff --git a/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionDeclaration1.types b/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionDeclaration1.types
index a51c4cd37d6..5970d6bac80 100644
--- a/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionDeclaration1.types
+++ b/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionDeclaration1.types
@@ -28,10 +28,10 @@ function greeter(person: string, person2: string) {
 >   : ^^
     }
     person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionExpression1.types b/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionExpression1.types
index d9adbaec3dc..09b9d03aba1 100644
--- a/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionExpression1.types
+++ b/tests/baselines/reference/unusedLocalsOnFunctionDeclarationWithinFunctionExpression1.types
@@ -30,10 +30,10 @@ var greeter = function (person: string, person2: string) {
 >   : ^^
     }
     person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionDeclaration1.types b/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionDeclaration1.types
index bee2a119fe5..cd8d692699a 100644
--- a/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionDeclaration1.types
+++ b/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionDeclaration1.types
@@ -30,10 +30,10 @@ function greeter(person: string, person2: string) {
 >   : ^^
     }
     person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionExpression1.types b/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionExpression1.types
index 24dd7c65774..71e7e273a84 100644
--- a/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionExpression1.types
+++ b/tests/baselines/reference/unusedLocalsOnFunctionExpressionWithinFunctionExpression1.types
@@ -32,10 +32,10 @@ var greeter = function (person: string, person2: string) {
 >   : ^^
     }
     person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedMultipleParameter1InContructor.types b/tests/baselines/reference/unusedMultipleParameter1InContructor.types
index 90a1a198fc3..10796faeb68 100644
--- a/tests/baselines/reference/unusedMultipleParameter1InContructor.types
+++ b/tests/baselines/reference/unusedMultipleParameter1InContructor.types
@@ -18,11 +18,11 @@ class Dummy {
 >   : ^^
 
         person2 = "Dummy value";
->person2 = "Dummy value" : string
->                        : ^^^^^^
+>person2 = "Dummy value" : "Dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"Dummy value" : string
->              : ^^^^^^
+>"Dummy value" : "Dummy value"
+>              : ^^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/unusedMultipleParameter1InFunctionExpression.types b/tests/baselines/reference/unusedMultipleParameter1InFunctionExpression.types
index 0460cfbde80..621346c1497 100644
--- a/tests/baselines/reference/unusedMultipleParameter1InFunctionExpression.types
+++ b/tests/baselines/reference/unusedMultipleParameter1InFunctionExpression.types
@@ -18,10 +18,10 @@ var func = function(person: string, person2: string) {
 >   : ^^
 
     person2 = "Dummy value";
->person2 = "Dummy value" : string
->                        : ^^^^^^
+>person2 = "Dummy value" : "Dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"Dummy value" : string
->              : ^^^^^^
+>"Dummy value" : "Dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedMultipleParameter2InContructor.types b/tests/baselines/reference/unusedMultipleParameter2InContructor.types
index e9d88eb53d4..5fa3b4c72e7 100644
--- a/tests/baselines/reference/unusedMultipleParameter2InContructor.types
+++ b/tests/baselines/reference/unusedMultipleParameter2InContructor.types
@@ -20,11 +20,11 @@ class Dummy {
 >   : ^^
 
         person2 = "Dummy value";
->person2 = "Dummy value" : string
->                        : ^^^^^^
+>person2 = "Dummy value" : "Dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"Dummy value" : string
->              : ^^^^^^
+>"Dummy value" : "Dummy value"
+>              : ^^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/unusedMultipleParameter2InFunctionExpression.types b/tests/baselines/reference/unusedMultipleParameter2InFunctionExpression.types
index 8b756c11308..0451f1c4fd3 100644
--- a/tests/baselines/reference/unusedMultipleParameter2InFunctionExpression.types
+++ b/tests/baselines/reference/unusedMultipleParameter2InFunctionExpression.types
@@ -20,10 +20,10 @@ var func = function(person: string, person2: string, person3: string) {
 >   : ^^
 
     person2 = "Dummy value";
->person2 = "Dummy value" : string
->                        : ^^^^^^
+>person2 = "Dummy value" : "Dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"Dummy value" : string
->              : ^^^^^^
+>"Dummy value" : "Dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedMultipleParameters1InFunctionDeclaration.types b/tests/baselines/reference/unusedMultipleParameters1InFunctionDeclaration.types
index 55250778500..75694ebf3c6 100644
--- a/tests/baselines/reference/unusedMultipleParameters1InFunctionDeclaration.types
+++ b/tests/baselines/reference/unusedMultipleParameters1InFunctionDeclaration.types
@@ -16,10 +16,10 @@ function greeter(person: string, person2: string) {
 >   : ^^
 
     person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedMultipleParameters1InMethodDeclaration.types b/tests/baselines/reference/unusedMultipleParameters1InMethodDeclaration.types
index dae00f2363d..f14eb3b083a 100644
--- a/tests/baselines/reference/unusedMultipleParameters1InMethodDeclaration.types
+++ b/tests/baselines/reference/unusedMultipleParameters1InMethodDeclaration.types
@@ -20,11 +20,11 @@ class Dummy {
 >   : ^^
 
         person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/unusedMultipleParameters2InFunctionDeclaration.types b/tests/baselines/reference/unusedMultipleParameters2InFunctionDeclaration.types
index eb879e4b9f0..b236b5eeaab 100644
--- a/tests/baselines/reference/unusedMultipleParameters2InFunctionDeclaration.types
+++ b/tests/baselines/reference/unusedMultipleParameters2InFunctionDeclaration.types
@@ -18,10 +18,10 @@ function greeter(person: string, person2: string, person3: string) {
 >   : ^^
 
     person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/unusedMultipleParameters2InMethodDeclaration.types b/tests/baselines/reference/unusedMultipleParameters2InMethodDeclaration.types
index f8701718c3b..b3333b9f2a8 100644
--- a/tests/baselines/reference/unusedMultipleParameters2InMethodDeclaration.types
+++ b/tests/baselines/reference/unusedMultipleParameters2InMethodDeclaration.types
@@ -22,11 +22,11 @@ class Dummy {
 >   : ^^
 
         person2 = "dummy value";
->person2 = "dummy value" : string
->                        : ^^^^^^
+>person2 = "dummy value" : "dummy value"
+>                        : ^^^^^^^^^^^^^
 >person2 : string
 >        : ^^^^^^
->"dummy value" : string
->              : ^^^^^^
+>"dummy value" : "dummy value"
+>              : ^^^^^^^^^^^^^
     }
 }
diff --git a/tests/baselines/reference/unusedPrivateStaticMembers.types b/tests/baselines/reference/unusedPrivateStaticMembers.types
index f14ec013d6d..4751796ca56 100644
--- a/tests/baselines/reference/unusedPrivateStaticMembers.types
+++ b/tests/baselines/reference/unusedPrivateStaticMembers.types
@@ -85,8 +85,8 @@ class Test4 {
 >  : ^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(n * Test4.m1(n - 1)) : number
 >                      : ^^^^^^
 >n * Test4.m1(n - 1) : number
@@ -126,8 +126,8 @@ class Test4 {
 >  : ^^^^^^
 >0 : 0
 >  : ^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >(n * Test4["m2"](n - 1)) : number
 >                         : ^^^^^^
 >n * Test4["m2"](n - 1) : number
diff --git a/tests/baselines/reference/unusedSetterInClass2.types b/tests/baselines/reference/unusedSetterInClass2.types
index 21532ff23c3..e6385d701fb 100644
--- a/tests/baselines/reference/unusedSetterInClass2.types
+++ b/tests/baselines/reference/unusedSetterInClass2.types
@@ -17,15 +17,15 @@ class Employee {
 >  : ^^^^^^^^^^
 
         this.p = 0;
->this.p = 0 : number
->           : ^^^^^^
+>this.p = 0 : 0
+>           : ^
 >this.p : number
 >       : ^^^^^^
 >this : this
 >     : ^^^^
 >p : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
     }
 }
diff --git a/tests/baselines/reference/unusedVariablesWithUnderscoreInBindingElement.types b/tests/baselines/reference/unusedVariablesWithUnderscoreInBindingElement.types
index 039637db157..eebef095a18 100644
--- a/tests/baselines/reference/unusedVariablesWithUnderscoreInBindingElement.types
+++ b/tests/baselines/reference/unusedVariablesWithUnderscoreInBindingElement.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts] ////
 
 === Performance Stats ===
-Type Count: 500 -> 1,000
+Type Count: 250 -> 1,000
 
 === unusedVariablesWithUnderscoreInBindingElement.ts ===
 function t1() {
diff --git a/tests/baselines/reference/useBeforeDeclaration.types b/tests/baselines/reference/useBeforeDeclaration.types
index 02b0997edfd..54fe93f5aa0 100644
--- a/tests/baselines/reference/useBeforeDeclaration.types
+++ b/tests/baselines/reference/useBeforeDeclaration.types
@@ -49,8 +49,8 @@ namespace ts {
 >                   : ^^^^^^^^^^^^^^^^^^^^
 >version : string
 >        : ^^^^^^
->"2.0.5" : string
->        : ^^^^^^
+>"2.0.5" : "2.0.5"
+>        : ^^^^^^^
 
 }
 
diff --git a/tests/baselines/reference/useRegexpGroups.types b/tests/baselines/reference/useRegexpGroups.types
index 9783099e316..2a8f47aa80b 100644
--- a/tests/baselines/reference/useRegexpGroups.types
+++ b/tests/baselines/reference/useRegexpGroups.types
@@ -18,8 +18,8 @@ let result = re.exec("2015-01-02");
 >   : ^^^^^^
 >exec : (string: string) => RegExpExecArray | null
 >     : ^      ^^      ^^^^^                      
->"2015-01-02" : string
->             : ^^^^^^
+>"2015-01-02" : "2015-01-02"
+>             : ^^^^^^^^^^^^
 
 let date = result[0];
 >date : string
diff --git a/tests/baselines/reference/useSharedArrayBuffer1.types b/tests/baselines/reference/useSharedArrayBuffer1.types
index 74fabe278d7..c38436e1680 100644
--- a/tests/baselines/reference/useSharedArrayBuffer1.types
+++ b/tests/baselines/reference/useSharedArrayBuffer1.types
@@ -8,8 +8,8 @@ var foge = new SharedArrayBuffer(1024);
 >                            : ^^^^^^^^^^^^^^^^^
 >SharedArrayBuffer : SharedArrayBufferConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1024 : number
->     : ^^^^^^
+>1024 : 1024
+>     : ^^^^
 
 var bar = foge.slice(1, 10);
 >bar : SharedArrayBuffer
@@ -22,10 +22,10 @@ var bar = foge.slice(1, 10);
 >     : ^^^^^^^^^^^^^^^^^
 >slice : (begin: number, end?: number) => SharedArrayBuffer
 >      : ^     ^^      ^^   ^^^      ^^^^^                 
->1 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>1 : 1
+>  : ^
+>10 : 10
+>   : ^^
 
 var len = foge.byteLength;
 >len : number
diff --git a/tests/baselines/reference/useSharedArrayBuffer4.types b/tests/baselines/reference/useSharedArrayBuffer4.types
index b743adf29ab..b52df1777c6 100644
--- a/tests/baselines/reference/useSharedArrayBuffer4.types
+++ b/tests/baselines/reference/useSharedArrayBuffer4.types
@@ -8,8 +8,8 @@ var foge = new SharedArrayBuffer(1024);
 >                            : ^^^^^^^^^^^^^^^^^
 >SharedArrayBuffer : SharedArrayBufferConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1024 : number
->     : ^^^^^^
+>1024 : 1024
+>     : ^^^^
 
 var bar = foge.slice(1, 10);
 >bar : SharedArrayBuffer
@@ -22,10 +22,10 @@ var bar = foge.slice(1, 10);
 >     : ^^^^^^^^^^^^^^^^^
 >slice : (begin: number, end?: number) => SharedArrayBuffer
 >      : ^     ^^      ^^   ^^^      ^^^^^                 
->1 : number
->  : ^^^^^^
->10 : number
->   : ^^^^^^
+>1 : 1
+>  : ^
+>10 : 10
+>   : ^^
 
 var species = foge[Symbol.species];
 >species : SharedArrayBuffer
diff --git a/tests/baselines/reference/useSharedArrayBuffer5.types b/tests/baselines/reference/useSharedArrayBuffer5.types
index a3c315679b5..d1dd6056743 100644
--- a/tests/baselines/reference/useSharedArrayBuffer5.types
+++ b/tests/baselines/reference/useSharedArrayBuffer5.types
@@ -8,8 +8,8 @@ var foge = new SharedArrayBuffer(1024);
 >                            : ^^^^^^^^^^^^^^^^^
 >SharedArrayBuffer : SharedArrayBufferConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1024 : number
->     : ^^^^^^
+>1024 : 1024
+>     : ^^^^
 
 var species = foge[Symbol.species];
 >species : SharedArrayBuffer
diff --git a/tests/baselines/reference/useSharedArrayBuffer6.types b/tests/baselines/reference/useSharedArrayBuffer6.types
index 72dfb8538fb..309db3630f1 100644
--- a/tests/baselines/reference/useSharedArrayBuffer6.types
+++ b/tests/baselines/reference/useSharedArrayBuffer6.types
@@ -8,8 +8,8 @@ var foge = new SharedArrayBuffer(1024);
 >                            : ^^^^^^^^^^^^^^^^^
 >SharedArrayBuffer : SharedArrayBufferConstructor
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->1024 : number
->     : ^^^^^^
+>1024 : 1024
+>     : ^^^^
 
 foge.length; // should error
 >foge.length : any
diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
index 02b779fe676..1f9fe2da352 100644
--- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
+++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
@@ -73,10 +73,10 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0);
 >  : ^^^^^^^^
 >Point : typeof A.Point
 >      : ^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>0 : 0
+>  : ^
 
 var c: { name: string };
 >c : { name: string; }
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
index 09f5d15183d..c6539c05485 100644
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -80,8 +80,8 @@ var p: Point = { x: 0, y: undefined };
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
@@ -114,12 +114,12 @@ var p: { x: number; y: number; } = { x: 1, y: 2 };
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >y : number
 >  : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var p = <{ x: number; y: number; }>{ x: 0, y: undefined };
 >p : Point
@@ -134,8 +134,8 @@ var p = <{ x: number; y: number; }>{ x: 0, y: undefined };
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >y : undefined
 >  : ^^^^^^^^^
 >undefined : undefined
diff --git a/tests/baselines/reference/varBlock.types b/tests/baselines/reference/varBlock.types
index c616a2ec229..c8813d93b41 100644
--- a/tests/baselines/reference/varBlock.types
+++ b/tests/baselines/reference/varBlock.types
@@ -10,8 +10,8 @@ module m2 {
 >  : ^^^
 >b2 : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/varRequireFromJavascript.types b/tests/baselines/reference/varRequireFromJavascript.types
index b5337d3df6d..6b428d5174b 100644
--- a/tests/baselines/reference/varRequireFromJavascript.types
+++ b/tests/baselines/reference/varRequireFromJavascript.types
@@ -22,8 +22,8 @@ var crunch = new ex.Crunch(1);
 >   : ^^^^^^^^^
 >Crunch : typeof ex.Crunch
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 crunch.n
 >crunch.n : number
diff --git a/tests/baselines/reference/varRequireFromTypescript.types b/tests/baselines/reference/varRequireFromTypescript.types
index ddeb35ae9c2..6597a68f0dc 100644
--- a/tests/baselines/reference/varRequireFromTypescript.types
+++ b/tests/baselines/reference/varRequireFromTypescript.types
@@ -22,8 +22,8 @@ var crunch = new ex.Crunch(1);
 >   : ^^^^^^^^^
 >Crunch : typeof ex.Crunch
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 crunch.n
 >crunch.n : number
diff --git a/tests/baselines/reference/vararg.types b/tests/baselines/reference/vararg.types
index 746be0b432c..1c702db1e02 100644
--- a/tests/baselines/reference/vararg.types
+++ b/tests/baselines/reference/vararg.types
@@ -174,10 +174,10 @@ result+=x.f(x,3,3); // bad first param
 >  : ^ ^^      ^^^^^    ^^        ^^^^^^^^^^^
 >x : M.C
 >  : ^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 result+=x.f(3,"hello",3); // bad second param
 >result+=x.f(3,"hello",3) : string
@@ -192,12 +192,12 @@ result+=x.f(3,"hello",3); // bad second param
 >  : ^^^
 >f : (x: string, ...rest: number[]) => string
 >  : ^ ^^      ^^^^^    ^^        ^^^^^^^^^^^
->3 : number
->  : ^^^^^^
->"hello" : string
->        : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
+>"hello" : "hello"
+>        : ^^^^^^^
+>3 : 3
+>  : ^
 
 result+=x.f("hello",3,3,3,3,3); // ok
 >result+=x.f("hello",3,3,3,3,3) : string
@@ -212,18 +212,18 @@ result+=x.f("hello",3,3,3,3,3); // ok
 >  : ^^^
 >f : (x: string, ...rest: number[]) => string
 >  : ^ ^^      ^^^^^    ^^        ^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
+>3 : 3
+>  : ^
 
 result+=x.f("hello"); // ok varargs length 0
 >result+=x.f("hello") : string
@@ -238,8 +238,8 @@ result+=x.f("hello"); // ok varargs length 0
 >  : ^^^
 >f : (x: string, ...rest: number[]) => string
 >  : ^ ^^      ^^^^^    ^^        ^^^^^^^^^^^
->"hello" : string
->        : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
 
 result+=x.fonly(3); // ok conversion
 >result+=x.fonly(3) : string
@@ -254,8 +254,8 @@ result+=x.fonly(3); // ok conversion
 >  : ^^^
 >fonly : (...rest: string[]) => any
 >      : ^^^^    ^^        ^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 result+=x.fonly(x); // bad param
 >result+=x.fonly(x) : string
@@ -286,8 +286,8 @@ result+=x.fonly("a"); // ok
 >  : ^^^
 >fonly : (...rest: string[]) => any
 >      : ^^^^    ^^        ^^^^^^^^
->"a" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
 
 result+=x.fonly("a","b","c","d"); //ok 
 >result+=x.fonly("a","b","c","d") : string
@@ -302,14 +302,14 @@ result+=x.fonly("a","b","c","d"); //ok
 >  : ^^^
 >fonly : (...rest: string[]) => any
 >      : ^^^^    ^^        ^^^^^^^^
->"a" : string
->    : ^^^^^^
->"b" : string
->    : ^^^^^^
->"c" : string
->    : ^^^^^^
->"d" : string
->    : ^^^^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
+>"d" : "d"
+>    : ^^^
 
 
 
diff --git a/tests/baselines/reference/vardecl.types b/tests/baselines/reference/vardecl.types
index 97d90abe96e..e74765d8244 100644
--- a/tests/baselines/reference/vardecl.types
+++ b/tests/baselines/reference/vardecl.types
@@ -57,10 +57,10 @@ var arrayVar: string[] = ['a', 'b'];
 >         : ^^^^^^^^
 >['a', 'b'] : string[]
 >           : ^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 
 var complicatedArrayVar: { x: number; y: string; }[] ;
 >complicatedArrayVar : { x: number; y: string; }[]
@@ -83,12 +83,12 @@ complicatedArrayVar.push({ x: 30, y : 'hello world' });
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 >y : string
 >  : ^^^^^^
->'hello world' : string
->              : ^^^^^^
+>'hello world' : "hello world"
+>              : ^^^^^^^^^^^^^
 
 var n1: { [s: string]: number; };
 >n1 : { [s: string]: number; }
@@ -202,8 +202,8 @@ module m2 {
 >a : any
 >b2 : number
 >   : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b : any
 
     var m1;
@@ -213,8 +213,8 @@ module m2 {
 >a2 : any
 >b22 : number
 >    : ^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >b222 : any
 
     var m3;
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
index 1e099b48149..979aeb58087 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
@@ -426,7 +426,7 @@ class FileService {
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^
 >getRequestUrl : { (service: string, path?: string): string; (service: string, path?: string, absolute?: boolean): string; }
 >              : ^^^       ^^      ^^    ^^^      ^^^      ^^^       ^^      ^^    ^^^      ^^        ^^^       ^^^      ^^^
->'root' : string
+>'root' : "root"
 >       : ^^^^^^
 >path : string
 >     : ^^^^^^
@@ -434,7 +434,7 @@ class FileService {
             type: 'POST',
 >type : string
 >     : ^^^^^^
->'POST' : string
+>'POST' : "POST"
 >       : ^^^^^^
 
             headers: {},
diff --git a/tests/baselines/reference/variadicTuples1.types b/tests/baselines/reference/variadicTuples1.types
index 789fae279e7..9564f788455 100644
--- a/tests/baselines/reference/variadicTuples1.types
+++ b/tests/baselines/reference/variadicTuples1.types
@@ -93,12 +93,12 @@ const t2 = tup2(['hello'], [10, true]);
 >     : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^      ^^ ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >['hello'] : [string]
 >          : ^^^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >[10, true] : [number, true]
 >           : ^^^^^^^^^^^^^^
->10 : number
->   : ^^^^^^
+>10 : 10
+>   : ^^
 >true : true
 >     : ^^^^
 
@@ -148,12 +148,12 @@ const tc2 = concat(['hello'], [42]);
 >       : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^      ^^ ^^      ^^^^^            
 >['hello'] : [string]
 >          : ^^^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >[42] : [number]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 const tc3 = concat([1, 2, 3], sa);
 >tc3 : [number, number, number, ...string[]]
@@ -164,12 +164,12 @@ const tc3 = concat([1, 2, 3], sa);
 >       : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^      ^^ ^^      ^^^^^            
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >sa : string[]
 >   : ^^^^^^^^
 
@@ -184,12 +184,12 @@ const tc4 = concat(sa, [1, 2, 3]);  // Ideally would be [...string[], number, nu
 >   : ^^^^^^^^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 function concat2<T extends readonly unknown[], U extends readonly unknown[]>(t: T, u: U) {
 >concat2 : <T extends readonly unknown[], U extends readonly unknown[]>(t: T, u: U) => (T[number] | U[number])[]
@@ -269,18 +269,18 @@ function foo2(t1: [number, string], t2: [boolean], a1: number[]) {
 >                                 : ^^^^
 >foo1 : (a: number, b: string, c: boolean, ...d: number[]) => void
 >     : ^ ^^      ^^ ^^      ^^ ^^       ^^^^^ ^^        ^^^^^    
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 >true : true
 >     : ^^^^
->42 : number
->   : ^^^^^^
->43 : number
->   : ^^^^^^
->44 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
+>43 : 43
+>   : ^^
+>44 : 44
+>   : ^^
 
     foo1(...t1, true, 42, 43, 44);
 >foo1(...t1, true, 42, 43, 44) : void
@@ -293,12 +293,12 @@ function foo2(t1: [number, string], t2: [boolean], a1: number[]) {
 >   : ^^^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
->42 : number
->   : ^^^^^^
->43 : number
->   : ^^^^^^
->44 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
+>43 : 43
+>   : ^^
+>44 : 44
+>   : ^^
 
     foo1(...t1, ...t2, 42, 43, 44);
 >foo1(...t1, ...t2, 42, 43, 44) : void
@@ -313,12 +313,12 @@ function foo2(t1: [number, string], t2: [boolean], a1: number[]) {
 >      : ^^^^^^^
 >t2 : [boolean]
 >   : ^^^^^^^^^
->42 : number
->   : ^^^^^^
->43 : number
->   : ^^^^^^
->44 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
+>43 : 43
+>   : ^^
+>44 : 44
+>   : ^^
 
     foo1(...t1, ...t2, ...a1);
 >foo1(...t1, ...t2, ...a1) : void
@@ -380,32 +380,32 @@ function foo4<U extends unknown[]>(u: U) {
 >           : ^^
 >foo3 : <T extends unknown[]>(x: number, ...args: [...T, number]) => T
 >     : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^              ^^^^^ 
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
     foo3(1, 'hello', true, 2);
 >foo3(1, 'hello', true, 2) : [string, boolean]
 >                          : ^^^^^^^^^^^^^^^^^
 >foo3 : <T extends unknown[]>(x: number, ...args: [...T, number]) => T
 >     : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^              ^^^^^ 
->1 : number
->  : ^^^^^^
->'hello' : string
->        : ^^^^^^
+>1 : 1
+>  : ^
+>'hello' : "hello"
+>        : ^^^^^^^
 >true : true
 >     : ^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
     foo3(1, ...u, 'hi', 2);
 >foo3(1, ...u, 'hi', 2) : [...U, string]
 >                       : ^^^^^^^^^^^^^^
 >foo3 : <T extends unknown[]>(x: number, ...args: [...T, number]) => T
 >     : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^              ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...u : unknown
 >     : ^^^^^^^
 >u : U
@@ -420,8 +420,8 @@ function foo4<U extends unknown[]>(u: U) {
 >        : ^^^^^^^^^
 >foo3 : <T extends unknown[]>(x: number, ...args: [...T, number]) => T
 >     : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^              ^^^^^ 
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 }
 
 // Contextual typing of array literals
@@ -457,10 +457,10 @@ ft1(['hello', 42]);  // (string | number)[]
 >    : ^ ^^^^^^^^^         ^^ ^^ ^^^^^ 
 >['hello', 42] : (string | number)[]
 >              : ^^^^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 ft2(['hello', 42]);  // readonly (string | number)[]
 >ft2(['hello', 42]) : readonly (string | number)[]
@@ -469,10 +469,10 @@ ft2(['hello', 42]);  // readonly (string | number)[]
 >    : ^ ^^^^^^^^^         ^^ ^^ ^^^^^               
 >['hello', 42] : (string | number)[]
 >              : ^^^^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 ft3(['hello', 42]);  // [string, number]
 >ft3(['hello', 42]) : [string, number]
@@ -481,10 +481,10 @@ ft3(['hello', 42]);  // [string, number]
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^ 
 >['hello', 42] : [string, number]
 >              : ^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 ft4(['hello', 42]);  // readonly [string, number]
 >ft4(['hello', 42]) : readonly [string, number]
@@ -493,10 +493,10 @@ ft4(['hello', 42]);  // readonly [string, number]
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^               
 >['hello', 42] : [string, number]
 >              : ^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 
 // Indexing variadic tuple types
 
@@ -699,20 +699,20 @@ let tm1 = fm1([['abc'], [42], [true], ['def']]);  // [boolean, string]
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >['abc'] : string[]
 >        : ^^^^^^^^
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >[42] : number[]
 >     : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >[true] : true[]
 >       : ^^^^^^
 >true : true
 >     : ^^^^
 >['def'] : string[]
 >        : ^^^^^^^^
->'def' : string
->      : ^^^^^^
+>'def' : "def"
+>      : ^^^^^
 
 // Spread of readonly array-like infers mutable array-like
 
@@ -737,16 +737,16 @@ function gx1<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >           : ^^
 >fx1 : <T extends unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
     fx1('abc', ...u);  // U
 >fx1('abc', ...u) : U
 >                 : ^
 >fx1 : <T extends unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...u : unknown
 >     : ^^^^^^^
 >u : U
@@ -757,8 +757,8 @@ function gx1<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >                 : ^^^^^^
 >fx1 : <T extends unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...v : unknown
 >     : ^^^^^^^
 >v : V
@@ -769,8 +769,8 @@ function gx1<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >                    : ^
 >fx1 : <T extends unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...u : unknown
 >     : ^^^^^^^
 >u : U
@@ -781,8 +781,8 @@ function gx1<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >                    : ^
 >fx1 : <T extends unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^         ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...v : unknown
 >     : ^^^^^^^
 >v : V
@@ -810,16 +810,16 @@ function gx2<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >           : ^^
 >fx2 : <T extends readonly unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^                  ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 
     fx2('abc', ...u);  // U
 >fx2('abc', ...u) : U
 >                 : ^
 >fx2 : <T extends readonly unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^                  ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...u : unknown
 >     : ^^^^^^^
 >u : U
@@ -830,8 +830,8 @@ function gx2<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >                 : ^^^^^^
 >fx2 : <T extends readonly unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^                  ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...v : unknown
 >     : ^^^^^^^
 >v : V
@@ -842,8 +842,8 @@ function gx2<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >                    : ^
 >fx2 : <T extends readonly unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^                  ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...u : unknown
 >     : ^^^^^^^
 >u : U
@@ -854,8 +854,8 @@ function gx2<U extends unknown[], V extends readonly unknown[]>(u: U, v: V) {
 >                    : ^
 >fx2 : <T extends readonly unknown[]>(a: string, ...args: T) => T
 >    : ^ ^^^^^^^^^                  ^^ ^^      ^^^^^    ^^ ^^^^^ 
->'abc' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
 >...v : unknown
 >     : ^^^^^^^
 >v : V
@@ -1663,8 +1663,8 @@ const c1 = curry(fn1, 1);  // (b: string, c: boolean, d: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn1 : (a: number, b: string, c: boolean, d: string[]) => number
 >    : ^ ^^      ^^ ^^      ^^ ^^       ^^ ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const c2 = curry(fn1, 1, 'abc');  // (c: boolean, d: string[]) => number
 >c2 : (c: boolean, d: string[]) => number
@@ -1675,10 +1675,10 @@ const c2 = curry(fn1, 1, 'abc');  // (c: boolean, d: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn1 : (a: number, b: string, c: boolean, d: string[]) => number
 >    : ^ ^^      ^^ ^^      ^^ ^^       ^^ ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 
 const c3 = curry(fn1, 1, 'abc', true);  // (d: string[]) => number
 >c3 : (d: string[]) => number
@@ -1689,10 +1689,10 @@ const c3 = curry(fn1, 1, 'abc', true);  // (d: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn1 : (a: number, b: string, c: boolean, d: string[]) => number
 >    : ^ ^^      ^^ ^^      ^^ ^^       ^^ ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -1705,18 +1705,18 @@ const c4 = curry(fn1, 1, 'abc', true, ['x', 'y']);  // () => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn1 : (a: number, b: string, c: boolean, d: string[]) => number
 >    : ^ ^^      ^^ ^^      ^^ ^^       ^^ ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 >['x', 'y'] : string[]
 >           : ^^^^^^^^
->'x' : string
->    : ^^^^^^
->'y' : string
->    : ^^^^^^
+>'x' : "x"
+>    : ^^^
+>'y' : "y"
+>    : ^^^
 
 const fn2 = (x: number, b: boolean, ...args: string[]) => 0;
 >fn2 : (x: number, b: boolean, ...args: string[]) => number
@@ -1751,8 +1751,8 @@ const c11 = curry(fn2, 1);  // (b: boolean, ...args: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn2 : (x: number, b: boolean, ...args: string[]) => number
 >    : ^ ^^      ^^ ^^       ^^^^^    ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const c12 = curry(fn2, 1, true);  // (...args: string[]) => number
 >c12 : (...b: string[]) => number
@@ -1763,8 +1763,8 @@ const c12 = curry(fn2, 1, true);  // (...args: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn2 : (x: number, b: boolean, ...args: string[]) => number
 >    : ^ ^^      ^^ ^^       ^^^^^    ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
 
@@ -1777,14 +1777,14 @@ const c13 = curry(fn2, 1, true, 'abc', 'def');  // (...args: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn2 : (x: number, b: boolean, ...args: string[]) => number
 >    : ^ ^^      ^^ ^^       ^^^^^    ^^        ^^^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >true : true
 >     : ^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
 const fn3 = (...args: string[]) => 0;
 >fn3 : (...args: string[]) => number
@@ -1815,10 +1815,10 @@ const c21 = curry(fn3, 'abc', 'def');  // (...args: string[]) => number
 >      : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^ ^^                            ^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^
 >fn3 : (...args: string[]) => number
 >    : ^^^^    ^^        ^^^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 
 const c22 = curry(fn3, ...sa);  // (...args: string[]) => number
 >c22 : (...b: string[]) => number
@@ -1882,10 +1882,10 @@ curry2(fn10, ['hello', 42], [true]);
 >     : ^ ^^      ^^ ^^      ^^ ^^       ^^^^^        
 >['hello', 42] : [string, number]
 >              : ^^^^^^^^^^^^^^^^
->'hello' : string
->        : ^^^^^^
->42 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>42 : 42
+>   : ^^
 >[true] : [true]
 >       : ^^^^^^
 >true : true
@@ -1900,12 +1900,12 @@ curry2(fn10, ['hello'], [42, true]);
 >     : ^ ^^      ^^ ^^      ^^ ^^       ^^^^^        
 >['hello'] : [string]
 >          : ^^^^^^^^
->'hello' : string
->        : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
 >[42, true] : [number, true]
 >           : ^^^^^^^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 >true : true
 >     : ^^^^
 
@@ -1926,20 +1926,20 @@ ft([1, 2, 3], [1, 2, 3]);
 >   : ^ ^^^^^^^^^         ^^  ^^      ^^  ^^               ^^^^^ 
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 ft([1, 2], [1, 2, 3]);
 >ft([1, 2], [1, 2, 3]) : [number, number]
@@ -1948,18 +1948,18 @@ ft([1, 2], [1, 2, 3]);
 >   : ^ ^^^^^^^^^         ^^  ^^      ^^  ^^               ^^^^^ 
 >[1, 2] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 >[1, 2, 3] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
 ft(['a', 'b'], ['c', 'd'])
 >ft(['a', 'b'], ['c', 'd']) : [string, string]
@@ -1968,16 +1968,16 @@ ft(['a', 'b'], ['c', 'd'])
 >   : ^ ^^^^^^^^^         ^^  ^^      ^^  ^^               ^^^^^ 
 >['a', 'b'] : [string, string]
 >           : ^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 >['c', 'd'] : [string, string]
 >           : ^^^^^^^^^^^^^^^^
->'c' : string
->    : ^^^^^^
->'d' : string
->    : ^^^^^^
+>'c' : "c"
+>    : ^^^
+>'d' : "d"
+>    : ^^^
 
 ft(['a', 'b'], ['c', 'd', 42])
 >ft(['a', 'b'], ['c', 'd', 42]) : [string, string]
@@ -1986,18 +1986,18 @@ ft(['a', 'b'], ['c', 'd', 42])
 >   : ^ ^^^^^^^^^         ^^  ^^      ^^  ^^               ^^^^^ 
 >['a', 'b'] : [string, string]
 >           : ^^^^^^^^^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 >['c', 'd', 42] : [string, string, number]
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^
->'c' : string
->    : ^^^^^^
->'d' : string
->    : ^^^^^^
->42 : number
->   : ^^^^^^
+>'c' : "c"
+>    : ^^^
+>'d' : "d"
+>    : ^^^
+>42 : 42
+>   : ^^
 
 // Last argument is contextually typed
 
@@ -2014,18 +2014,18 @@ call('hello', 32, (a, b) => 42);
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >call : <T extends unknown[], R>(...args: [...T, (...args: T) => R]) => [T, R]
 >     : ^ ^^^^^^^^^         ^^ ^^^^^    ^^                         ^^^^^      
->'hello' : string
->        : ^^^^^^
->32 : number
->   : ^^^^^^
+>'hello' : "hello"
+>        : ^^^^^^^
+>32 : 32
+>   : ^^
 >(a, b) => 42 : (a: string, b: number) => number
 >             : ^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
 >b : number
 >  : ^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 call(...sa, (...x) => 42);
 >call(...sa, (...x) => 42) : [string[], number]
@@ -2040,8 +2040,8 @@ call(...sa, (...x) => 42);
 >             : ^^^^ ^^^^^^^^^^^^^^^^^^^^^
 >x : string[]
 >  : ^^^^^^^^
->42 : number
->   : ^^^^^^
+>42 : 42
+>   : ^^
 
 // No inference to ending optional elements (except with identical structure)
 
@@ -2076,10 +2076,10 @@ function f21<U extends string[]>(args: [...U, number?]) {
 >    : ^ ^^^^^^^^^         ^^^^^^^    ^^               ^^^^^ 
 >["foo", "bar"] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
     let v3 = f20(["foo", 42]);  // [string]
 >v3 : [string]
@@ -2090,10 +2090,10 @@ function f21<U extends string[]>(args: [...U, number?]) {
 >    : ^ ^^^^^^^^^         ^^^^^^^    ^^               ^^^^^ 
 >["foo", 42] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->42 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>42 : 42
+>   : ^^
 }
 
 declare function f22<T extends unknown[] = []>(args: [...T, number]): T;
@@ -2133,10 +2133,10 @@ function f23<U extends string[]>(args: [...U, number]) {
 >    : ^^^ ^^^^^^^^^         ^^^^^^^    ^^              ^^^ ^^^ ^^^^^^^^^         ^^^^^^^    ^^      ^^^ ^^^
 >["foo", "bar"] : [string, string]
 >               : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->"bar" : string
->      : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>"bar" : "bar"
+>      : ^^^^^
 
     let v3 = f22(["foo", 42]);  // [string]
 >v3 : [string]
@@ -2147,10 +2147,10 @@ function f23<U extends string[]>(args: [...U, number]) {
 >    : ^^^ ^^^^^^^^^         ^^^^^^^    ^^              ^^^ ^^^ ^^^^^^^^^         ^^^^^^^    ^^      ^^^ ^^^
 >["foo", 42] : [string, number]
 >            : ^^^^^^^^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->42 : number
->   : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>42 : 42
+>   : ^^
 }
 
 // Repro from #39327
@@ -2186,10 +2186,10 @@ const b = a.bind("", 1);  // Desc<[boolean], object>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >bind : <T extends unknown[], U extends unknown[], R>(this: Desc<[...T, ...U], R>, ...args: T) => Desc<[...U], R>
 >     : ^ ^^^^^^^^^         ^^ ^^^^^^^^^         ^^ ^^    ^^                     ^^^^^    ^^ ^^^^^               
->"" : string
->   : ^^^^^^
->1 : number
->  : ^^^^^^
+>"" : ""
+>   : ^^
+>1 : 1
+>  : ^
 
 // Repro from #39607
 
diff --git a/tests/baselines/reference/variadicTuples2.errors.txt b/tests/baselines/reference/variadicTuples2.errors.txt
index d9f5b9067d4..269771a5f26 100644
--- a/tests/baselines/reference/variadicTuples2.errors.txt
+++ b/tests/baselines/reference/variadicTuples2.errors.txt
@@ -8,7 +8,7 @@ variadicTuples2.ts(14,31): error TS1265: A rest element cannot follow another re
 variadicTuples2.ts(47,1): error TS2322: Type '[string, string, number, number]' is not assignable to type '[...string[], number]'.
   Type at positions 0 through 2 in source is not compatible with type at position 0 in target.
     Type 'number' is not assignable to type 'string'.
-variadicTuples2.ts(53,5): error TS2345: Argument of type '[string, string, number, number]' is not assignable to parameter of type '[...strs: string[], num: number]'.
+variadicTuples2.ts(53,5): error TS2345: Argument of type '["abc", "def", 5, 6]' is not assignable to parameter of type '[...strs: string[], num: number]'.
   Type at positions 0 through 2 in source is not compatible with type at position 0 in target.
     Type 'number' is not assignable to type 'string'.
 variadicTuples2.ts(56,1): error TS2322: Type '[number]' is not assignable to type '[number, ...string[], number]'.
@@ -25,14 +25,14 @@ variadicTuples2.ts(63,1): error TS2322: Type '[number, string, string, boolean]'
     Type 'boolean' is not assignable to type 'number'.
 variadicTuples2.ts(66,1): error TS2345: Argument of type '[]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
   Source has 0 element(s) but target requires 1.
-variadicTuples2.ts(68,8): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
+variadicTuples2.ts(68,8): error TS2345: Argument of type '[1, 2]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
   Type at position 0 in source is not compatible with type at position 0 in target.
     Type 'number' is not assignable to type 'string'.
-variadicTuples2.ts(71,8): error TS2345: Argument of type '[string, number, string]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
+variadicTuples2.ts(71,8): error TS2345: Argument of type '["abc", 1, "def"]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
   Type at positions 0 through 1 in source is not compatible with type at position 0 in target.
     Type 'number' is not assignable to type 'string'.
 variadicTuples2.ts(72,5): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'number'.
-variadicTuples2.ts(73,8): error TS2345: Argument of type '[string, string, true]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
+variadicTuples2.ts(73,8): error TS2345: Argument of type '["abc", "def", true]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
   Type at position 2 in source is not compatible with type at position 1 in target.
     Type 'boolean' is not assignable to type 'number'.
 variadicTuples2.ts(76,5): error TS2322: Type '[number, number]' is not assignable to type '[number, ...T]'.
@@ -49,7 +49,7 @@ variadicTuples2.ts(79,5): error TS2322: Type '[number, ...T]' is not assignable
 variadicTuples2.ts(84,5): error TS2322: Type '[number, string, ...any[]]' is not assignable to type '[number, ...number[]]'.
   Type at positions 1 through 2 in source is not compatible with type at position 1 in target.
     Type 'string' is not assignable to type 'number'.
-variadicTuples2.ts(116,16): error TS2345: Argument of type '[number, number, number, number]' is not assignable to parameter of type '[...number[], (...values: number[]) => void]'.
+variadicTuples2.ts(116,16): error TS2345: Argument of type '[1, 2, 3, number]' is not assignable to parameter of type '[...number[], (...values: number[]) => void]'.
   Type at position 3 in source is not compatible with type at position 1 in target.
     Type 'number' is not assignable to type '(...values: number[]) => void'.
 variadicTuples2.ts(117,6): error TS2345: Argument of type 'string[]' is not assignable to parameter of type '[...string[], (...values: string[]) => void]'.
@@ -64,7 +64,7 @@ variadicTuples2.ts(127,5): error TS2345: Argument of type '[number]' is not assi
   Source has 1 element(s) but target requires 2.
 variadicTuples2.ts(137,16): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 variadicTuples2.ts(138,16): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
-variadicTuples2.ts(139,25): error TS2345: Argument of type '[string, number, number, number]' is not assignable to parameter of type '[...string[], number]'.
+variadicTuples2.ts(139,25): error TS2345: Argument of type '["blah2", 1, 2, 3]' is not assignable to parameter of type '[...string[], number]'.
   Type at positions 0 through 2 in source is not compatible with type at position 0 in target.
     Type 'number' is not assignable to type 'string'.
 
@@ -142,7 +142,7 @@ variadicTuples2.ts(139,25): error TS2345: Argument of type '[string, number, num
     ft1('abc', 'def', 5);
     ft1('abc', 'def', 5, 6);  // Error
         ~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '[string, string, number, number]' is not assignable to parameter of type '[...strs: string[], num: number]'.
+!!! error TS2345: Argument of type '["abc", "def", 5, 6]' is not assignable to parameter of type '[...strs: string[], num: number]'.
 !!! error TS2345:   Type at positions 0 through 2 in source is not compatible with type at position 0 in target.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
     
@@ -181,14 +181,14 @@ variadicTuples2.ts(139,25): error TS2345: Argument of type '[string, number, num
     ft2(0, 1);
     ft2(0, 1, 2);  // Error
            ~~~~
-!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
+!!! error TS2345: Argument of type '[1, 2]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
 !!! error TS2345:   Type at position 0 in source is not compatible with type at position 0 in target.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
     ft2(0, 'abc', 1);
     ft2(0, 'abc', 'def', 1);
     ft2(0, 'abc', 1, 'def');  // Error
            ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '[string, number, string]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
+!!! error TS2345: Argument of type '["abc", 1, "def"]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
 !!! error TS2345:   Type at positions 0 through 1 in source is not compatible with type at position 0 in target.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
     ft2(true, 'abc', 'def', 1);  // Error
@@ -196,7 +196,7 @@ variadicTuples2.ts(139,25): error TS2345: Argument of type '[string, number, num
 !!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'number'.
     ft2(0, 'abc', 'def', true);  // Error
            ~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '[string, string, true]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
+!!! error TS2345: Argument of type '["abc", "def", true]' is not assignable to parameter of type '[...strs: string[], n2: number]'.
 !!! error TS2345:   Type at position 2 in source is not compatible with type at position 1 in target.
 !!! error TS2345:     Type 'boolean' is not assignable to type 'number'.
     
@@ -262,7 +262,7 @@ variadicTuples2.ts(139,25): error TS2345: Argument of type '[string, number, num
     
     pipe<number[]>(1, 2, 3, 4);  // Error
                    ~~~~~~~~~~
-!!! error TS2345: Argument of type '[number, number, number, number]' is not assignable to parameter of type '[...number[], (...values: number[]) => void]'.
+!!! error TS2345: Argument of type '[1, 2, 3, number]' is not assignable to parameter of type '[...number[], (...values: number[]) => void]'.
 !!! error TS2345:   Type at position 3 in source is not compatible with type at position 1 in target.
 !!! error TS2345:     Type 'number' is not assignable to type '(...values: number[]) => void'.
     pipe(...sa);  // Error
@@ -308,7 +308,7 @@ variadicTuples2.ts(139,25): error TS2345: Argument of type '[string, number, num
 !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
     const e1 = foo('blah1', 'blah2', 1, 2, 3);  // Error
                             ~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '[string, number, number, number]' is not assignable to parameter of type '[...string[], number]'.
+!!! error TS2345: Argument of type '["blah2", 1, 2, 3]' is not assignable to parameter of type '[...string[], number]'.
 !!! error TS2345:   Type at positions 0 through 2 in source is not compatible with type at position 0 in target.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/variadicTuples2.types b/tests/baselines/reference/variadicTuples2.types
index dc47c55a895..34516c7d758 100644
--- a/tests/baselines/reference/variadicTuples2.types
+++ b/tests/baselines/reference/variadicTuples2.types
@@ -130,8 +130,8 @@ tt1 = [5];
 >    : ^^^^^^^^^^^^^^^^^^^^^
 >[5] : [number]
 >    : ^^^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 tt1 = ['abc', 5];
 >tt1 = ['abc', 5] : [string, number]
@@ -140,10 +140,10 @@ tt1 = ['abc', 5];
 >    : ^^^^^^^^^^^^^^^^^^^^^
 >['abc', 5] : [string, number]
 >           : ^^^^^^^^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>5 : 5
+>  : ^
 
 tt1 = ['abc', 'def', 5];
 >tt1 = ['abc', 'def', 5] : [string, string, number]
@@ -152,12 +152,12 @@ tt1 = ['abc', 'def', 5];
 >    : ^^^^^^^^^^^^^^^^^^^^^
 >['abc', 'def', 5] : [string, string, number]
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>5 : 5
+>  : ^
 
 tt1 = ['abc', 'def', 5, 6];  // Error
 >tt1 = ['abc', 'def', 5, 6] : [string, string, number, number]
@@ -166,14 +166,14 @@ tt1 = ['abc', 'def', 5, 6];  // Error
 >    : ^^^^^^^^^^^^^^^^^^^^^
 >['abc', 'def', 5, 6] : [string, string, number, number]
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 declare function ft1(...args: [...strs: string[], num: number]): void;
 >ft1 : (...args: [...strs: string[], num: number]) => void
@@ -186,44 +186,44 @@ ft1(5);
 >       : ^^^^
 >ft1 : (...args: [...strs: string[], num: number]) => void
 >    : ^^^^    ^^                                ^^^^^    
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 ft1('abc', 5);
 >ft1('abc', 5) : void
 >              : ^^^^
 >ft1 : (...args: [...strs: string[], num: number]) => void
 >    : ^^^^    ^^                                ^^^^^    
->'abc' : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>5 : 5
+>  : ^
 
 ft1('abc', 'def', 5);
 >ft1('abc', 'def', 5) : void
 >                     : ^^^^
 >ft1 : (...args: [...strs: string[], num: number]) => void
 >    : ^^^^    ^^                                ^^^^^    
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>5 : 5
+>  : ^
 
 ft1('abc', 'def', 5, 6);  // Error
 >ft1('abc', 'def', 5, 6) : void
 >                        : ^^^^
 >ft1 : (...args: [...strs: string[], num: number]) => void
 >    : ^^^^    ^^                                ^^^^^    
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->5 : number
->  : ^^^^^^
->6 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>5 : 5
+>  : ^
+>6 : 6
+>  : ^
 
 declare let tt2: [number, ...string[], number];
 >tt2 : [number, ...string[], number]
@@ -236,8 +236,8 @@ tt2 = [0];  // Error
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0] : [number]
 >    : ^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 tt2 = [0, 1];
 >tt2 = [0, 1] : [number, number]
@@ -246,10 +246,10 @@ tt2 = [0, 1];
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, 1] : [number, number]
 >       : ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
 tt2 = [0, 1, 2];  // Error
 >tt2 = [0, 1, 2] : [number, number, number]
@@ -258,12 +258,12 @@ tt2 = [0, 1, 2];  // Error
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, 1, 2] : [number, number, number]
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 tt2 = [0, 'abc', 1];
 >tt2 = [0, 'abc', 1] : [number, string, number]
@@ -272,12 +272,12 @@ tt2 = [0, 'abc', 1];
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, 'abc', 1] : [number, string, number]
 >              : ^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 tt2 = [0, 'abc', 'def', 1];
 >tt2 = [0, 'abc', 'def', 1] : [number, string, string, number]
@@ -286,14 +286,14 @@ tt2 = [0, 'abc', 'def', 1];
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, 'abc', 'def', 1] : [number, string, string, number]
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 tt2 = [0, 'abc', 1, 'def'];  // Error
 >tt2 = [0, 'abc', 1, 'def'] : [number, string, number, string]
@@ -302,14 +302,14 @@ tt2 = [0, 'abc', 1, 'def'];  // Error
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, 'abc', 1, 'def'] : [number, string, number, string]
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->'def' : string
->      : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>'def' : "def"
+>      : ^^^^^
 
 tt2 = [true, 'abc', 'def', 1];  // Error
 >tt2 = [true, 'abc', 'def', 1] : [boolean, string, string, number]
@@ -320,12 +320,12 @@ tt2 = [true, 'abc', 'def', 1];  // Error
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >true : true
 >     : ^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 tt2 = [0, 'abc', 'def', true];  // Error
 >tt2 = [0, 'abc', 'def', true] : [number, string, string, boolean]
@@ -334,12 +334,12 @@ tt2 = [0, 'abc', 'def', true];  // Error
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[0, 'abc', 'def', true] : [number, string, string, boolean]
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -356,70 +356,70 @@ ft2(0);  // Error
 >       : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 ft2(0, 1);
 >ft2(0, 1) : void
 >          : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
 
 ft2(0, 1, 2);  // Error
 >ft2(0, 1, 2) : void
 >             : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 ft2(0, 'abc', 1);
 >ft2(0, 'abc', 1) : void
 >                 : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 ft2(0, 'abc', 'def', 1);
 >ft2(0, 'abc', 'def', 1) : void
 >                        : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 ft2(0, 'abc', 1, 'def');  // Error
 >ft2(0, 'abc', 1, 'def') : void
 >                        : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
->'def' : string
->      : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>1 : 1
+>  : ^
+>'def' : "def"
+>      : ^^^^^
 
 ft2(true, 'abc', 'def', 1);  // Error
 >ft2(true, 'abc', 'def', 1) : void
@@ -428,24 +428,24 @@ ft2(true, 'abc', 'def', 1);  // Error
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
 >true : true
 >     : ^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
->1 : number
->  : ^^^^^^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
+>1 : 1
+>  : ^
 
 ft2(0, 'abc', 'def', true);  // Error
 >ft2(0, 'abc', 'def', true) : void
 >                           : ^^^^
 >ft2 : (n1: number, ...rest: [...strs: string[], n2: number]) => void
 >    : ^  ^^      ^^^^^    ^^                               ^^^^^    
->0 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
->'def' : string
->      : ^^^^^^
+>0 : 0
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
+>'def' : "def"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -550,8 +550,8 @@ function pipe<T extends readonly unknown[]>(...args: [...T, (...values: T) => vo
 >     : ^^^^^^^^^^^      ^^ ^^^^^    ^
 >slice : (start?: number, end?: number) => (((...values: T) => void) | T[number])[]
 >      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^      ^^ ^^^^^    ^^^^^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >-1 : -1
 >   : ^^
 >1 : 1
@@ -573,10 +573,10 @@ pipe("foo", 123, true, (a, b, c) => {
 >                                                                                            : ^^^^
 >pipe : <T extends readonly unknown[]>(...args: [...T, (...values: T) => void]) => void
 >     : ^ ^^^^^^^^^                  ^^^^^    ^^                              ^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->123 : number
->    : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>123 : 123
+>    : ^^^
 >true : true
 >     : ^^^^
 >(a, b, c) => {    a;  // string    b;  // number    c;  // boolean} : (a: string, b: number, c: boolean) => void
@@ -607,10 +607,10 @@ pipe("foo", 123, true, (...x) => {
 >                                                                         : ^^^^
 >pipe : <T extends readonly unknown[]>(...args: [...T, (...values: T) => void]) => void
 >     : ^ ^^^^^^^^^                  ^^^^^    ^^                              ^^^^^^^^^
->"foo" : string
->      : ^^^^^^
->123 : number
->    : ^^^^^^
+>"foo" : "foo"
+>      : ^^^^^
+>123 : 123
+>    : ^^^
 >true : true
 >     : ^^^^
 >(...x) => {    x;  // [string, number, boolean]} : (x_0: string, x_1: number, x_2: boolean) => void
@@ -653,8 +653,8 @@ pipe(1, ...sa, 2, (...x) => {
 >                                                                                                                      : ^^^^
 >pipe : <T extends readonly unknown[]>(...args: [...T, (...values: T) => void]) => void
 >     : ^ ^^^^^^^^^                  ^^^^^    ^^                              ^^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 >...sa : string
 >      : ^^^^^^
 >sa : string[]
@@ -745,8 +745,8 @@ fn1([1]);  // Error
 >    : ^ ^^ ^^ ^^                    ^^^^^      
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 fn1([1, 'abc']);  // [number, string]
 >fn1([1, 'abc']) : [number, string]
@@ -755,10 +755,10 @@ fn1([1, 'abc']);  // [number, string]
 >    : ^ ^^ ^^ ^^                    ^^^^^      
 >[1, 'abc'] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 
 fn1([1, 'abc', true]);  // [string, boolean]
 >fn1([1, 'abc', true]) : [string, boolean]
@@ -767,10 +767,10 @@ fn1([1, 'abc', true]);  // [string, boolean]
 >    : ^ ^^ ^^ ^^                    ^^^^^      
 >[1, 'abc', true] : [number, string, true]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -795,8 +795,8 @@ fn2([1]);  // Error
 >    : ^ ^^ ^^ ^^                    ^^^^^      
 >[1] : [number]
 >    : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 fn2([1, 'abc']);  // [number, string]
 >fn2([1, 'abc']) : [number, string]
@@ -805,10 +805,10 @@ fn2([1, 'abc']);  // [number, string]
 >    : ^ ^^ ^^ ^^                    ^^^^^      
 >[1, 'abc'] : [number, string]
 >           : ^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 
 fn2([1, 'abc', true]);  // [number, boolean]
 >fn2([1, 'abc', true]) : [number, boolean]
@@ -817,10 +817,10 @@ fn2([1, 'abc', true]);  // [number, boolean]
 >    : ^ ^^ ^^ ^^                    ^^^^^      
 >[1, 'abc', true] : [number, string, true]
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
->1 : number
->  : ^^^^^^
->'abc' : string
->      : ^^^^^^
+>1 : 1
+>  : ^
+>'abc' : "abc"
+>      : ^^^^^
 >true : true
 >     : ^^^^
 
@@ -841,8 +841,8 @@ const a1 = foo('blah1', 1);
 >    : ^ ^^^^^^^^^                              ^^^^^                ^^                       ^^^^^              
 >'blah1' : "blah1"
 >        : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const b1 = foo('blah1', 'blah2', 1);
 >b1 : ["blah1", "blah2", number]
@@ -855,8 +855,8 @@ const b1 = foo('blah1', 'blah2', 1);
 >        : ^^^^^^^
 >'blah2' : "blah2"
 >        : ^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const c1 = foo(1);  // Error
 >c1 : [string, ...string[], number]
@@ -865,8 +865,8 @@ const c1 = foo(1);  // Error
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : <S extends readonly [string, ...string[]]>(...stringsAndNumber: readonly [...S, number]) => [...S, number]
 >    : ^ ^^^^^^^^^                              ^^^^^                ^^                       ^^^^^              
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 const d1 = foo(1, 2);  // Error
 >d1 : [string, ...string[], number]
@@ -875,10 +875,10 @@ const d1 = foo(1, 2);  // Error
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : <S extends readonly [string, ...string[]]>(...stringsAndNumber: readonly [...S, number]) => [...S, number]
 >    : ^ ^^^^^^^^^                              ^^^^^                ^^                       ^^^^^              
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 const e1 = foo('blah1', 'blah2', 1, 2, 3);  // Error
 >e1 : [string, ...string[], number]
@@ -887,14 +887,14 @@ const e1 = foo('blah1', 'blah2', 1, 2, 3);  // Error
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : <S extends readonly [string, ...string[]]>(...stringsAndNumber: readonly [...S, number]) => [...S, number]
 >    : ^ ^^^^^^^^^                              ^^^^^                ^^                       ^^^^^              
->'blah1' : string
->        : ^^^^^^
->'blah2' : string
->        : ^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
->3 : number
->  : ^^^^^^
+>'blah1' : "blah1"
+>        : ^^^^^^^
+>'blah2' : "blah2"
+>        : ^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+>3 : 3
+>  : ^
 
diff --git a/tests/baselines/reference/varianceAnnotations.types b/tests/baselines/reference/varianceAnnotations.types
index 429c5b4aaf0..149ddc169d2 100644
--- a/tests/baselines/reference/varianceAnnotations.types
+++ b/tests/baselines/reference/varianceAnnotations.types
@@ -376,12 +376,12 @@ const pu: Parent<unknown> = { child: { a: 0, b: 0, child: null, parent: null },
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >b : number
 >  : ^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 >child : null
 >      : ^^^^
 >parent : null
diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types
index 3f7d75891ec..4613c31aee2 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types
+++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types
@@ -49,8 +49,8 @@ import type { funciton as funciton2 } from "./decl"; // ok I guess?
 import("./decl"); // error
 >import("./decl") : Promise<typeof import("/decl")>
 >                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./decl" : string
->         : ^^^^^^
+>"./decl" : "./decl"
+>         : ^^^^^^^^
 
 type T = typeof import("./decl"); // ok
 >T : typeof import("/decl")
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.types b/tests/baselines/reference/voidAsNonAmbiguousReturnType.types
index 805571be0c0..f4f2a98667b 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.types
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.types
@@ -19,7 +19,7 @@ function main() {
 >   : ^^^^^^^^^
 >mkdirSync : (path: string, mode?: number) => void
 >          : ^    ^^      ^^    ^^^      ^^^^^    
->'test' : string
+>'test' : "test"
 >       : ^^^^^^
 }
 
diff --git a/tests/baselines/reference/voidFunctionAssignmentCompat.types b/tests/baselines/reference/voidFunctionAssignmentCompat.types
index a1715559cdb..223a89cab79 100644
--- a/tests/baselines/reference/voidFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/voidFunctionAssignmentCompat.types
@@ -124,7 +124,7 @@ var frv3: (v:any)=>number = (function() { return function () { return 0; } })()
 >                                                : ^^^^^^^^^^^^^^^^^^
 >function () { return 0; } : () => number
 >                          : ^^^^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.types b/tests/baselines/reference/voidOperatorWithNumberType.types
index 618eb54e123..20fde2f0069 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.types
+++ b/tests/baselines/reference/voidOperatorWithNumberType.types
@@ -11,16 +11,16 @@ var NUMBER1: number[] = [1, 2];
 >        : ^^^^^^^^
 >[1, 2] : number[]
 >       : ^^^^^^^^
->1 : number
->  : ^^^^^^
->2 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
 
 function foo(): number { return 1; }
 >foo : () => number
 >    : ^^^^^^      
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/voidOperatorWithStringType.types b/tests/baselines/reference/voidOperatorWithStringType.types
index acdacbb583b..cedab63d9e6 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.types
+++ b/tests/baselines/reference/voidOperatorWithStringType.types
@@ -11,16 +11,16 @@ var STRING1: string[] = ["", "abc"];
 >        : ^^^^^^^^
 >["", "abc"] : string[]
 >            : ^^^^^^^^
->"" : string
->   : ^^^^^^
->"abc" : string
->      : ^^^^^^
+>"" : ""
+>   : ^^
+>"abc" : "abc"
+>      : ^^^^^
 
 function foo(): string { return "abc"; }
 >foo : () => string
 >    : ^^^^^^      
->"abc" : string
->      : ^^^^^^
+>"abc" : "abc"
+>      : ^^^^^
 
 class A {
 >A : A
@@ -191,8 +191,8 @@ var ResultIsAny12 = void STRING.charAt(0);
 >       : ^^^^^^
 >charAt : (pos: number) => string
 >       : ^   ^^      ^^^^^      
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 
 // multiple void  operators
 var ResultIsAny13 = void void STRING;
diff --git a/tests/baselines/reference/vueLikeDataAndPropsInference.types b/tests/baselines/reference/vueLikeDataAndPropsInference.types
index d2c0cf7412b..f71eba5d8bf 100644
--- a/tests/baselines/reference/vueLikeDataAndPropsInference.types
+++ b/tests/baselines/reference/vueLikeDataAndPropsInference.types
@@ -84,8 +84,8 @@ test({
         foo: ''
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     },
 
diff --git a/tests/baselines/reference/vueLikeDataAndPropsInference2.types b/tests/baselines/reference/vueLikeDataAndPropsInference2.types
index 1fa5a704bf9..206646398de 100644
--- a/tests/baselines/reference/vueLikeDataAndPropsInference2.types
+++ b/tests/baselines/reference/vueLikeDataAndPropsInference2.types
@@ -85,8 +85,8 @@ test({
         foo: ''
 >foo : string
 >    : ^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
     },
 
diff --git a/tests/baselines/reference/widenToAny1.types b/tests/baselines/reference/widenToAny1.types
index e8a50a71858..ff6671a28ca 100644
--- a/tests/baselines/reference/widenToAny1.types
+++ b/tests/baselines/reference/widenToAny1.types
@@ -30,6 +30,6 @@ var z1: number = foo1({ x: undefined, y: "def" });  // Best common type is any
 >          : ^^^^^^^^^
 >y : string
 >  : ^^^^^^
->"def" : string
->      : ^^^^^^
+>"def" : "def"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/widenToAny2.types b/tests/baselines/reference/widenToAny2.types
index 2907c091f62..f8db97cc759 100644
--- a/tests/baselines/reference/widenToAny2.types
+++ b/tests/baselines/reference/widenToAny2.types
@@ -22,6 +22,6 @@ var z3:number = foo3([undefined, "def"]);  // Type is any, but should be string
 >                   : ^^^^^^^^
 >undefined : undefined
 >          : ^^^^^^^^^
->"def" : string
->      : ^^^^^^
+>"def" : "def"
+>      : ^^^^^
 
diff --git a/tests/baselines/reference/widenedTypes.types b/tests/baselines/reference/widenedTypes.types
index 5b9411cb162..a720b3f0152 100644
--- a/tests/baselines/reference/widenedTypes.types
+++ b/tests/baselines/reference/widenedTypes.types
@@ -48,16 +48,16 @@ var t = [3, (3, null)];
 >  : ^
 
 t[3] = "";
->t[3] = "" : string
->          : ^^^^^^
+>t[3] = "" : ""
+>          : ^^
 >t[3] : number
 >     : ^^^^^^
 >t : number[]
 >  : ^^^^^^^^
 >3 : 3
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var x: typeof undefined = 3;
 >x : any
@@ -94,16 +94,16 @@ var u = [3, (y = null)];
 >  : ^^^
 
 u[3] = "";
->u[3] = "" : string
->          : ^^^^^^
+>u[3] = "" : ""
+>          : ^^
 >u[3] : number
 >     : ^^^^^^
 >u : number[]
 >  : ^^^^^^^^
 >3 : 3
 >  : ^
->"" : string
->   : ^^^^^^
+>"" : ""
+>   : ^^
 
 var ob: { x: typeof undefined } = { x: "" };
 >ob : { x: typeof undefined; }
@@ -125,8 +125,8 @@ var arr: string[] = [3, null]; // not assignable because null is not widened. BC
 >    : ^^^^^^^^
 >[3, null] : number[]
 >          : ^^^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 
 var obj: { [x: string]: string; } = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any
 >obj : { [x: string]: string; }
@@ -137,8 +137,8 @@ var obj: { [x: string]: string; } = { x: 3, y: null }; // assignable because nul
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >y : null
 >  : ^^^^
 
diff --git a/tests/baselines/reference/wideningWithTopLevelTypeParameter.types b/tests/baselines/reference/wideningWithTopLevelTypeParameter.types
index 830fe59de6a..7ace3f10225 100644
--- a/tests/baselines/reference/wideningWithTopLevelTypeParameter.types
+++ b/tests/baselines/reference/wideningWithTopLevelTypeParameter.types
@@ -54,8 +54,8 @@ const c0 = f0(7);  // [number]
 >      : ^^^^^^^^
 >f0 : <T>(x: T) => [T]
 >   : ^ ^^ ^^ ^^^^^   
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
 const c1 = f1(7);  // [number]
 >c1 : [number]
@@ -64,8 +64,8 @@ const c1 = f1(7);  // [number]
 >      : ^^^^^^^^
 >f1 : <T>(x: C1<T>) => [T]
 >   : ^ ^^ ^^     ^^^^^   
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
 const c2 = f2(7);  // [number]
 >c2 : [number]
@@ -74,8 +74,8 @@ const c2 = f2(7);  // [number]
 >      : ^^^^^^^^
 >f2 : <T>(x: C1<C2<T>>) => [T]
 >   : ^ ^^ ^^         ^^^^^   
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
 const c3 = f3(7);  // [number]
 >c3 : [number]
@@ -84,8 +84,8 @@ const c3 = f3(7);  // [number]
 >      : ^^^^^^^^
 >f3 : <T>(x: C1<C2<C3<T>>>) => [T]
 >   : ^ ^^ ^^             ^^^^^   
->7 : number
->  : ^^^^^^
+>7 : 7
+>  : ^
 
 const c4 = f4(7);  // [7] since we have an internal nesting limit of 3
 >c4 : [7]
@@ -115,8 +115,8 @@ const a = new FormControl('');  // string
 >                    : ^^^^^^^^^^^^^^^^^^^
 >FormControl : typeof FormControl
 >            : ^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 class FormControl2<T> {
 >FormControl2 : FormControl2<T>
@@ -134,8 +134,8 @@ const b = new FormControl2('');  // string
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >FormControl2 : typeof FormControl2
 >             : ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 class FormControl3<T> {
 >FormControl3 : FormControl3<T>
@@ -153,6 +153,6 @@ const c = new FormControl3('');  // string
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >FormControl3 : typeof FormControl3
 >             : ^^^^^^^^^^^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/withExportDecl.types b/tests/baselines/reference/withExportDecl.types
index e63a1d78743..1d45b9b0fc6 100644
--- a/tests/baselines/reference/withExportDecl.types
+++ b/tests/baselines/reference/withExportDecl.types
@@ -88,10 +88,10 @@ var arrayVar: string[] = ['a', 'b'];
 >         : ^^^^^^^^
 >['a', 'b'] : string[]
 >           : ^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 
 export var exportedArrayVar: { x: number; y: string; }[] ;
 >exportedArrayVar : { x: number; y: string; }[]
@@ -114,12 +114,12 @@ exportedArrayVar.push({ x: 30, y : 'hello world' });
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
->30 : number
->   : ^^^^^^
+>30 : 30
+>   : ^^
 >y : string
 >  : ^^^^^^
->'hello world' : string
->              : ^^^^^^
+>'hello world' : "hello world"
+>              : ^^^^^^^^^^^^^
 
 function simpleFunction() {
 >simpleFunction : () => { x: string; y: string; n: number; }
diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types
index 84e7663b8f9..7fc757fb632 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -58,10 +58,10 @@ var arrayVar: string[] = ['a', 'b'];
 >         : ^^^^^^^^
 >['a', 'b'] : string[]
 >           : ^^^^^^^^
->'a' : string
->    : ^^^^^^
->'b' : string
->    : ^^^^^^
+>'a' : "a"
+>    : ^^^
+>'b' : "b"
+>    : ^^^
 
 
 function simpleFunction() {
diff --git a/tests/baselines/reference/witness.types b/tests/baselines/reference/witness.types
index 1fbde1b89fa..3352bfc8ac8 100644
--- a/tests/baselines/reference/witness.types
+++ b/tests/baselines/reference/witness.types
@@ -371,8 +371,8 @@ function fnArg1(x: typeof fnArg1, y: number) {
 >       : ^ ^^             ^^ ^^      ^^^^^^^^^
 >fnArg1 : (x: typeof fnArg1, y: number) => void
 >       : ^ ^^             ^^ ^^      ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 function overload1(x: (n: string) => string): string;
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.types b/tests/baselines/reference/wrappedAndRecursiveConstraints2.types
index 2f6b6c36d42..36c8b1804f8 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints2.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.types
@@ -17,8 +17,8 @@ var c = new C(1);
 >         : ^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->1 : number
->  : ^^^^^^
+>1 : 1
+>  : ^
 
 var c = new C(new C('')); // error
 >c : C<number>
@@ -31,6 +31,6 @@ var c = new C(new C('')); // error
 >          : ^^^^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints3.types b/tests/baselines/reference/wrappedAndRecursiveConstraints3.types
index 790b827ede9..bdd75b21619 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.types
@@ -46,8 +46,8 @@ var c = new C({ length: 2 });
 >              : ^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var r = c.foo({ length: 3, charAt: (x: number) => { '' } });
 >r : <V extends { length: number; charAt: (x: number) => void; }>(x: V) => V
@@ -64,8 +64,8 @@ var r = c.foo({ length: 3, charAt: (x: number) => { '' } });
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >charAt : (x: number) => void
 >       : ^ ^^      ^^^^^^^^^
 >(x: number) => { '' } : (x: number) => void
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.types b/tests/baselines/reference/wrappedAndRecursiveConstraints4.types
index ab1dd8c1126..eef87d8eb0d 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.types
@@ -44,8 +44,8 @@ var c = new C({ length: 2 });
 >              : ^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
->2 : number
->  : ^^^^^^
+>2 : 2
+>  : ^
 
 var r = c.foo('');
 >r : <V extends string>(x: V) => V
@@ -58,8 +58,8 @@ var r = c.foo('');
 >  : ^^^^^^^^^^^^^^^^^^^^^^
 >foo : <U extends { length: number; }>(x: U) => <V extends U>(x: V) => V
 >    : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^ ^^^^^^^^^^^^ ^^^^^^^^^
->'' : string
->   : ^^^^^^
+>'' : ""
+>   : ^^
 
 var r2 = r({ length: 3, charAt: (x: number) => { '' } }); // error
 >r2 : string
@@ -72,8 +72,8 @@ var r2 = r({ length: 3, charAt: (x: number) => { '' } }); // error
 >                                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
->3 : number
->  : ^^^^^^
+>3 : 3
+>  : ^
 >charAt : (x: number) => void
 >       : ^ ^^      ^^^^^^^^^
 >(x: number) => { '' } : (x: number) => void
diff --git a/tests/baselines/reference/wrappedRecursiveGenericType.types b/tests/baselines/reference/wrappedRecursiveGenericType.types
index 5a19262977f..c98ea5de25b 100644
--- a/tests/baselines/reference/wrappedRecursiveGenericType.types
+++ b/tests/baselines/reference/wrappedRecursiveGenericType.types
@@ -28,20 +28,20 @@ var x: A<number>;
 >  : ^^^^^^^^^
 
 x.val = 5;         // val -> number
->x.val = 5 : number
->          : ^^^^^^
+>x.val = 5 : 5
+>          : ^
 >x.val : number
 >      : ^^^^^^
 >x : A<number>
 >  : ^^^^^^^^^
 >val : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 x.a.val = 5;       // val -> number
->x.a.val = 5 : number
->            : ^^^^^^
+>x.a.val = 5 : 5
+>            : ^
 >x.a.val : number
 >        : ^^^^^^
 >x.a : B<number>
@@ -52,8 +52,8 @@ x.a.val = 5;       // val -> number
 >  : ^^^^^^^^^
 >val : number
 >    : ^^^^^^
->5 : number
->  : ^^^^^^
+>5 : 5
+>  : ^
 
 x.a.b.val = 5;     // val -> X<number> (This should be an error)
 >x.a.b.val = 5 : 5
diff --git a/tests/baselines/reference/yieldExpression1.types b/tests/baselines/reference/yieldExpression1.types
index 9bb74e56c16..38715c1dd92 100644
--- a/tests/baselines/reference/yieldExpression1.types
+++ b/tests/baselines/reference/yieldExpression1.types
@@ -27,7 +27,7 @@ function* b(): IterableIterator<number> {
     yield 0;
 >yield 0 : undefined
 >        : ^^^^^^^^^
->0 : number
->  : ^^^^^^
+>0 : 0
+>  : ^
 }